removed critical_edges flag. Other code depends on remove_critical_edges() doing...

[r7490]

diff --git a/ir/ir/irflag.c b/ir/ir/irflag.c
index f16590e..0e6c781 100644 (file)
--- a/ir/ir/irflag.c
+++ b/ir/ir/irflag.c
@@ -94,7 +94,6 @@ void set_opt_control_flow(int value)
   set_opt_control_flow_straightening(value);
   set_opt_control_flow_weak_simplification(value);
   set_opt_control_flow_strong_simplification(value);
-  set_opt_critical_edges(value);
 }
 
 void set_firm_verbosity (int value) {

diff --git a/ir/ir/irflag.h b/ir/ir/irflag.h
index 5e21bad..7041e18 100644 (file)
--- a/ir/ir/irflag.h
+++ b/ir/ir/irflag.h
@@ -155,9 +155,6 @@ void set_opt_control_flow_weak_simplification(int value);
 /** Enables/Disables strong if and loop simplification (in optimize_cf). */
 void set_opt_control_flow_strong_simplification(int value);
 
-/** Enables/Disables removal of critical control flow edges. */
-void set_opt_critical_edges(int value);
-
 /** Enables/Disables reassociation.
  *
  * If opt_reassociation == 1 reassociation is performed.

diff --git a/ir/ir/irflag_t.def b/ir/ir/irflag_t.def
index 5ddd6c9..fd5846b 100644 (file)
--- a/ir/ir/irflag_t.def
+++ b/ir/ir/irflag_t.def
@@ -36,68 +36,65 @@ I_FLAG(control_flow_weak_simplification   , 6, ON)
 /** */
 I_FLAG(control_flow_strong_simplification , 7, ON)
 
-/** */
-I_FLAG(critical_edges                     , 8, ON)
-
 /** Reclaim memory. */
-I_FLAG(dead_node_elimination              , 9, ON)
+I_FLAG(dead_node_elimination              , 8, ON)
 
 /** Reassociate nodes. */
-I_FLAG(reassociation                      , 10, ON)
+I_FLAG(reassociation                      , 9, ON)
 
 /** Do inlining transformation. */
-I_FLAG(inline                             , 11, ON)
+I_FLAG(inline                             , 10, ON)
 
 /** Remove dynamic method dispatch. */
-E_FLAG(dyn_meth_dispatch                  , 12, ON)
+E_FLAG(dyn_meth_dispatch                  , 11, ON)
 
 /** Transformations that normalize the firm representation
  *  as removing Ids and Tuples, useless Phis, SymConst(id) -> Const(entity) ...
  */
-I_FLAG(normalize                          , 13, ON)
+I_FLAG(normalize                          , 12, ON)
 
 /** Remove tail-recursion. */
-I_FLAG(tail_recursion                     , 14, ON)
+I_FLAG(tail_recursion                     , 13, ON)
 
 /** Free never called methods */
-I_FLAG(dead_method_elimination            , 15, ON)
+I_FLAG(dead_method_elimination            , 14, ON)
 
 /** precise exception context */
-I_FLAG(precise_exc_context                , 16, ON)
+I_FLAG(precise_exc_context                , 15, ON)
 
 /** Do loop unrolling */
-I_FLAG(loop_unrolling                     , 17, OFF)   /* currently buggy, 2.1.2006 */
+I_FLAG(loop_unrolling                     , 16, OFF)   /* currently buggy, 2.1.2006 */
 
 /** Do Strength reduction */
-I_FLAG(strength_red                       , 18, ON)
+I_FLAG(strength_red                       , 17, ON)
 
 /** Optimize Loads and Stores */
-I_FLAG(redundant_loadstore                , 19, ON)
+I_FLAG(redundant_loadstore                , 18, ON)
 
 /** Optimize Fragile OPs */
-I_FLAG(fragile_ops                        , 20, OFF)
+I_FLAG(fragile_ops                        , 19, OFF)
 
 /** If conversion. */
-I_FLAG(if_conversion                      , 21, OFF)
+I_FLAG(if_conversion                      , 20, OFF)
 
 /** Optimize real function calls. */
-I_FLAG(real_function_call                 , 22, ON)
+I_FLAG(real_function_call                 , 21, ON)
 
 /** Optimize cast nodes. */
-E_FLAG(optimize_class_casts               , 23, ON)
-E_FLAG(suppress_downcast_optimization     , 24, OFF)
+E_FLAG(optimize_class_casts               , 22, ON)
+E_FLAG(suppress_downcast_optimization     , 23, OFF)
 
 /** Not really an optimization, removes Confirm nodes. */
-I_FLAG(remove_confirm                     , 25, OFF)
+I_FLAG(remove_confirm                     , 24, OFF)
 
 /** Scalar replacement. */
-I_FLAG(scalar_replacement                 , 26, ON)
+I_FLAG(scalar_replacement                 , 25, ON)
 
 /** Load and Store have only Null exceptions. */
-I_FLAG(ldst_only_null_ptr_exceptions      , 27, ON)
+I_FLAG(ldst_only_null_ptr_exceptions      , 26, ON)
 
 /** Sel-based Null-pointer check elimination. */
-I_FLAG(sel_based_null_check_elim          , 28, OFF)
+I_FLAG(sel_based_null_check_elim          , 27, OFF)
 
 /** Closed world assumption. */
 I_FLAG(closed_world                       , 31, OFF)