From 53991c3a4b7d367258ad2ffa283106d3543ef424 Mon Sep 17 00:00:00 2001 From: Matthias Braun Date: Wed, 4 Jul 2007 21:13:12 +0000 Subject: [PATCH] always do if conversion when opt_if_conv is called [r14942] --- include/libfirm/irflag.h | 8 -------- ir/ir/irflag_t.def | 21 +++++++++------------ ir/opt/ifconv.c | 5 +---- 3 files changed, 10 insertions(+), 24 deletions(-) diff --git a/include/libfirm/irflag.h b/include/libfirm/irflag.h index 1489253f2..ca907efc3 100644 --- a/include/libfirm/irflag.h +++ b/include/libfirm/irflag.h @@ -234,14 +234,6 @@ void set_opt_tail_recursion_verbose(int value); */ void set_opt_fragile_ops(int value); -/** - * Enable/Disable if conversion. - * - * If conversion tries to turn Conds into Mux nodes to eliminate - * control flow. - */ -void set_opt_if_conversion(int value); - /** * Enable/Disable function call optimization. * diff --git a/ir/ir/irflag_t.def b/ir/ir/irflag_t.def index da4b57109..dfc009a83 100644 --- a/ir/ir/irflag_t.def +++ b/ir/ir/irflag_t.def @@ -89,33 +89,30 @@ I_FLAG(redundant_loadstore , 18, ON) /** Optimize Fragile OPs */ I_FLAG(fragile_ops , 19, OFF) -/** If conversion. */ -I_FLAG(if_conversion , 20, OFF) - /** Optimize function calls. */ -I_FLAG(function_call , 21, ON) +I_FLAG(function_call , 20, ON) /** Optimize cast nodes. */ -E_FLAG(optimize_class_casts , 22, ON) -E_FLAG(suppress_downcast_optimization , 23, OFF) +E_FLAG(optimize_class_casts , 21, ON) +E_FLAG(suppress_downcast_optimization , 22, OFF) /** Not really an optimization, removes Confirm nodes. */ -I_FLAG(remove_confirm , 24, OFF) +I_FLAG(remove_confirm , 23, OFF) /** Scalar replacement. */ -I_FLAG(scalar_replacement , 25, ON) +I_FLAG(scalar_replacement , 24, ON) /** Load and Store have only Null exceptions. */ -I_FLAG(ldst_only_null_ptr_exceptions , 26, ON) +I_FLAG(ldst_only_null_ptr_exceptions , 25, ON) /** Sel-based Null-pointer check elimination. */ -I_FLAG(sel_based_null_check_elim , 27, OFF) +I_FLAG(sel_based_null_check_elim , 26, OFF) /** Automatically create Sync node during construction. */ -I_FLAG(auto_create_sync , 28, OFF) +I_FLAG(auto_create_sync , 27, OFF) /** Enable Alias-analysis. */ -I_FLAG(alias_analysis , 29, ON) +I_FLAG(alias_analysis , 28, ON) /** Closed world assumption. */ I_FLAG(closed_world , 31, OFF) diff --git a/ir/opt/ifconv.c b/ir/opt/ifconv.c index fde3026de..0722ac272 100644 --- a/ir/opt/ifconv.c +++ b/ir/opt/ifconv.c @@ -574,7 +574,7 @@ static ir_node* meld_psi(ir_node* psi) conds[j] = cond; vals[j] = val; ++j; - cond = get_Psi_cond(psi, i) + cond = get_Psi_cond(psi, i); val = v; } } @@ -650,9 +650,6 @@ void opt_if_conv(ir_graph *irg, const opt_if_conv_info_t *params) struct obstack obst; opt_if_conv_info_t p; - if (! get_opt_if_conversion()) - return; - /* get the parameters */ p = (params != NULL ? *params : default_info); -- 2.20.1