Make spiller more deterministic.

[libfirm] / ir / opt / ldstopt.c

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index 7aca233..64df7f7 100644 (file)
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -49,7 +49,6 @@
 #include "set.h"
 #include "be.h"
 #include "debug.h"
-#include "opt_manage.h"
 
 /** The debug handle. */
 DEBUG_ONLY(static firm_dbg_module_t *dbg;)
@@ -2081,10 +2080,16 @@ static int optimize_loops(ir_graph *irg)
 /*
  * do the load store optimization
  */
-static ir_graph_state_t do_loadstore_opt(ir_graph *irg)
+void optimize_load_store(ir_graph *irg)
 {
        walk_env_t env;
-       ir_graph_state_t res = 0;
+
+       assure_irg_properties(irg,
+               IR_GRAPH_PROPERTY_NO_UNREACHABLE_CODE
+               | IR_GRAPH_PROPERTY_CONSISTENT_OUT_EDGES
+               | IR_GRAPH_PROPERTY_NO_CRITICAL_EDGES
+               | IR_GRAPH_PROPERTY_CONSISTENT_DOMINANCE
+               | IR_GRAPH_PROPERTY_CONSISTENT_ENTITY_USAGE);
 
        FIRM_DBG_REGISTER(dbg, "firm.opt.ldstopt");
 
@@ -2110,31 +2115,15 @@ static ir_graph_state_t do_loadstore_opt(ir_graph *irg)
 
        obstack_free(&env.obst, NULL);
 
-       /* Handle graph state */
-       if (env.changes) {
-               edges_deactivate(irg);
-       }
-
-       if (!(env.changes & CF_CHANGED)) {
-               res |= IR_GRAPH_STATE_CONSISTENT_DOMINANCE | IR_GRAPH_STATE_NO_BADS;
-       }
-
-       return res;
-}
-
-static optdesc_t opt_loadstore = {
-       "load-store",
-       IR_GRAPH_STATE_NO_UNREACHABLE_CODE | IR_GRAPH_STATE_CONSISTENT_OUT_EDGES | IR_GRAPH_STATE_NO_CRITICAL_EDGES | IR_GRAPH_STATE_CONSISTENT_DOMINANCE | IR_GRAPH_STATE_CONSISTENT_ENTITY_USAGE,
-       do_loadstore_opt,
-};
-
-int optimize_load_store(ir_graph *irg)
-{
-       perform_irg_optimization(irg, &opt_loadstore);
-       return 1;
+       confirm_irg_properties(irg,
+               env.changes
+               ? env.changes & CF_CHANGED
+                       ? IR_GRAPH_PROPERTIES_NONE
+                       : IR_GRAPH_PROPERTIES_CONTROL_FLOW
+               : IR_GRAPH_PROPERTIES_ALL);
 }
 
 ir_graph_pass_t *optimize_load_store_pass(const char *name)
 {
-       return def_graph_pass_ret(name ? name : "ldst", optimize_load_store);
+       return def_graph_pass(name ? name : "ldst", optimize_load_store);
 }  /* optimize_load_store_pass */