condeval is called jump threading now

[r26270]

diff --git a/driver/firm_cmdline.c b/driver/firm_cmdline.c
index a0b90ed..945637d 100644 (file)
--- a/driver/firm_cmdline.c
+++ b/driver/firm_cmdline.c
@@ -292,7 +292,7 @@ static void disable_opts(void) {
   /* firm_opt.control_flow */
   firm_opt.gcse            = FALSE;
   firm_opt.gvn_pre         = FALSE;
-  firm_opt.cond_eval       = FALSE;
+  firm_opt.jumpthreading   = FALSE;
   firm_opt.if_conversion   = FALSE;
   firm_opt.func_calls      = FALSE;
   firm_opt.do_inline       = FALSE;

diff --git a/driver/firm_opt.c b/driver/firm_opt.c
index 883e101..a5f8a8f 100644 (file)
--- a/driver/firm_opt.c
+++ b/driver/firm_opt.c
@@ -504,7 +504,7 @@ static void do_firm_optimizations(const char *input_filename)
   set_opt_enabled("sync", firm_opt.sync);
   set_opt_enabled("ldst", firm_opt.load_store);
   set_opt_enabled("deconv", firm_opt.deconv);
-  set_opt_enabled("condeval", firm_opt.cond_eval);
+  set_opt_enabled("jumpthreading", firm_opt.jumpthreading);
   set_opt_enabled("gvnpre", firm_opt.gvn_pre);
   set_opt_enabled("ifconv", firm_opt.if_conversion);
   set_opt_enabled("bool", firm_opt.bool_opt);

diff --git a/main.c b/main.c
index bc0be10..b93ac30 100644 (file)
--- a/main.c
+++ b/main.c
@@ -752,7 +752,7 @@ int main(int argc, char **argv)
                /* use_builtins = true; */
                /* fallthrough */
        case 3:
-               set_option("cond-eval");
+               set_option("jumpthreading");
                set_option("if-conv");
                /* fallthrough */
        case 2: