- representing the 3-state visibility (default,local,external) with 2 bits was

[libfirm] / ir / opt / escape_ana.c

diff --git a/ir/opt/escape_ana.c b/ir/opt/escape_ana.c
index ea0f4e0..48f0b03 100644 (file)
--- a/ir/opt/escape_ana.c
+++ b/ir/opt/escape_ana.c
@@ -33,9 +33,7 @@
  *
  * A fast and simple Escape analysis.
  */
-#ifdef HAVE_CONFIG_H
-# include "config.h"
-#endif
+#include "config.h"
 
 #include "iroptimize.h"
 
@@ -394,7 +392,7 @@ static void transform_allocs(ir_graph *irg, walk_env_t *env)
        blk = get_nodes_block(alloc);
     turn_into_tuple(alloc, pn_Alloc_max);
     set_Tuple_pred(alloc, pn_Alloc_M, mem);
-    set_Tuple_pred(alloc, pn_Alloc_X_regular, new_r_Jmp(irg, blk));
+    set_Tuple_pred(alloc, pn_Alloc_X_regular, new_r_Jmp(blk));
     set_Tuple_pred(alloc, pn_Alloc_X_except, new_r_Bad(irg));
 
     ++env->nr_deads;
@@ -435,13 +433,12 @@ static void transform_allocs(ir_graph *irg, walk_env_t *env)
       name[sizeof(name) - 1] = '\0';
       ent = new_d_entity(ftp, new_id_from_str(name), get_Alloc_type(alloc), dbg);
 
-      sel = new_rd_simpleSel(dbg, irg, get_nodes_block(alloc),
-        get_irg_no_mem(irg), get_irg_frame(irg), ent);
+      sel = new_rd_simpleSel(dbg, get_nodes_block(alloc), get_irg_no_mem(irg), get_irg_frame(irg), ent);
       mem = get_Alloc_mem(alloc);
 
       turn_into_tuple(alloc, pn_Alloc_max);
       set_Tuple_pred(alloc, pn_Alloc_M, mem);
-         set_Tuple_pred(alloc, pn_Alloc_X_regular, new_r_Jmp(irg, blk));
+         set_Tuple_pred(alloc, pn_Alloc_X_regular, new_r_Jmp(blk));
       set_Tuple_pred(alloc, pn_Alloc_X_except, new_r_Bad(irg));
       set_Tuple_pred(alloc, pn_Alloc_res, sel);
 
@@ -488,11 +485,10 @@ static void transform_alloc_calls(ir_graph *irg, walk_env_t *env)
     mem = get_Call_mem(call);
        blk = get_nodes_block(call);
     turn_into_tuple(call, pn_Call_max);
-    set_Tuple_pred(call, pn_Call_M_regular, mem);
-       set_Tuple_pred(call, pn_Call_X_regular, new_r_Jmp(irg, blk));
-    set_Tuple_pred(call, pn_Call_X_except, new_r_Bad(irg));
-    set_Tuple_pred(call, pn_Call_T_result, new_r_Bad(irg));
-    set_Tuple_pred(call, pn_Call_M_except, mem);
+    set_Tuple_pred(call, pn_Call_M,                mem);
+       set_Tuple_pred(call, pn_Call_X_regular,        new_r_Jmp(blk));
+    set_Tuple_pred(call, pn_Call_X_except,         new_r_Bad(irg));
+    set_Tuple_pred(call, pn_Call_T_result,         new_r_Bad(irg));
     set_Tuple_pred(call, pn_Call_P_value_res_base, new_r_Bad(irg));
 
     ++env->nr_deads;
@@ -563,7 +559,7 @@ void escape_analysis(int run_scalar_replace, check_alloc_entity_func callback)
   obstack_init(&obst);
   elist = NULL;
 
-  env = obstack_alloc(&obst, sizeof(*env));
+  env = OALLOC(&obst, walk_env_t);
   env->found_allocs = NULL;
   env->dead_allocs  = NULL;
   env->callback     = callback;
@@ -589,7 +585,7 @@ void escape_analysis(int run_scalar_replace, check_alloc_entity_func callback)
 
       elist = env;
 
-      env = obstack_alloc(&obst, sizeof(*env));
+      env = OALLOC(&obst, walk_env_t);
       env->found_allocs = NULL;
       env->dead_allocs  = NULL;
       env->callback     = callback;