Remove unused operand specifications.

[libfirm] / ir / opt / ldstopt.c

diff --git a/ir/opt/ldstopt.c b/ir/opt/ldstopt.c
index 829cdae..f45e7df 100644 (file)
--- a/ir/opt/ldstopt.c
+++ b/ir/opt/ldstopt.c
@@ -207,11 +207,11 @@ static void collect_nodes(ir_node *node, void *env)
                        }
 
                        /*
-                       * Place the Proj's to the same block as the
-                       * predecessor Load. This is always ok and prevents
-                       * "non-SSA" form after optimizations if the Proj
-                       * is in a wrong block.
-                       */
+                        * Place the Proj's to the same block as the
+                        * predecessor Load. This is always ok and prevents
+                        * "non-SSA" form after optimizations if the Proj
+                        * is in a wrong block.
+                        */
                        blk      = get_nodes_block(node);
                        pred_blk = get_nodes_block(pred);
                        if (blk != pred_blk) {
@@ -245,10 +245,16 @@ static void collect_nodes(ir_node *node, void *env)
                int i;
 
                for (i = get_Block_n_cfgpreds(node) - 1; i >= 0; --i) {
-                       ir_node      *pred_block;
+                       ir_node      *pred_block, *proj;
                        block_info_t *bl_info;
+                       int          is_exc = 0;
 
-                       pred = skip_Proj(get_Block_cfgpred(node, i));
+                       pred = proj = get_Block_cfgpred(node, i);
+
+                       if (is_Proj(proj)) {
+                               pred   = get_Proj_pred(proj);
+                               is_exc = get_Proj_proj(proj) == pn_Generic_X_except;
+                       }
 
                        /* ignore Bad predecessors, they will be removed later */
                        if (is_Bad(pred))
@@ -257,12 +263,12 @@ static void collect_nodes(ir_node *node, void *env)
                        pred_block = get_nodes_block(pred);
                        bl_info    = get_block_info(pred_block, wenv);
 
-                       if (is_fragile_op(pred))
+                       if (is_fragile_op(pred) && is_exc)
                                bl_info->flags |= BLOCK_HAS_EXC;
                        else if (is_irn_forking(pred))
                                bl_info->flags |= BLOCK_HAS_COND;
 
-                       if (get_irn_op(pred) == op_Load || get_irn_op(pred) == op_Store) {
+                       if (is_exc && (get_irn_op(pred) == op_Load || get_irn_op(pred) == op_Store)) {
                                ldst_info = get_ldst_info(pred, wenv);
 
                                wenv->changes |= update_exc(ldst_info, node, i);
@@ -964,7 +970,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        int i, n;
        ir_node *store, *old_store, *ptr, *block, *phi_block, *phiM, *phiD, *exc, *projM;
        ir_mode *mode;
-       ir_node **inM, **inD, **stores;
+       ir_node **inM, **inD, **projMs;
        int *idx;
        dbg_info *db = NULL;
        ldst_info_t *info;
@@ -979,7 +985,12 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        if (n <= 0)
                return 0;
 
-       store = skip_Proj(get_Phi_pred(phi, 0));
+       /* must be only one user */
+       projM = get_Phi_pred(phi, 0);
+       if (get_irn_n_edges(projM) != 1)
+               return 0;
+
+       store = skip_Proj(projM);
        old_store = store;
        if (get_irn_op(store) != op_Store)
                return 0;
@@ -997,7 +1008,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
                return 0;
 
        phi_block = get_nodes_block(phi);
-       if (! block_postdominates(phi_block, block))
+       if (! block_strictly_postdominates(phi_block, block))
                return 0;
 
        /* this is the address of the store */
@@ -1007,8 +1018,12 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        exc  = info->exc_block;
 
        for (i = 1; i < n; ++i) {
-               ir_node *pred = skip_Proj(get_Phi_pred(phi, i));
+               ir_node *pred = get_Phi_pred(phi, i);
 
+               if (get_irn_n_edges(pred) != 1)
+                       return 0;
+
+               pred = skip_Proj(pred);
                if (get_irn_op(pred) != op_Store)
                        return 0;
 
@@ -1054,7 +1069,7 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
         * Is only allowed if the predecessor blocks have only one successor.
         */
 
-       NEW_ARR_A(ir_node *, stores, n);
+       NEW_ARR_A(ir_node *, projMs, n);
        NEW_ARR_A(ir_node *, inM, n);
        NEW_ARR_A(ir_node *, inD, n);
        NEW_ARR_A(int, idx, n);
@@ -1063,19 +1078,18 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
           first because we otherwise may loose a store when exchanging its
           memory Proj.
         */
-       for (i = 0; i < n; ++i)
-               stores[i] = skip_Proj(get_Phi_pred(phi, i));
+       for (i = n - 1; i >= 0; --i) {
+               ir_node *store;
 
-       /* first step: collect all inputs */
-       for (i = 0; i < n; ++i) {
-               ir_node *store = stores[i];
-               info = get_irn_link(store);
+               projMs[i] = get_Phi_pred(phi, i);
+               assert(is_Proj(projMs[i]));
+
+               store = get_Proj_pred(projMs[i]);
+               info  = get_irn_link(store);
 
                inM[i] = get_Store_mem(store);
                inD[i] = get_Store_value(store);
                idx[i] = info->exc_idx;
-
-               kill_node(store);
        }
        block = get_nodes_block(phi);
 
@@ -1085,6 +1099,17 @@ static unsigned optimize_phi(ir_node *phi, walk_env_t *wenv)
        /* third step: create a new data Phi */
        phiD = new_rd_Phi(get_irn_dbg_info(phi), current_ir_graph, block, n, inD, mode);
 
+       /* rewire memory and kill the node */
+       for (i = n - 1; i >= 0; --i) {
+               ir_node *proj  = projMs[i];
+
+               if(is_Proj(proj)) {
+                       ir_node *store = get_Proj_pred(proj);
+                       exchange(proj, inM[i]);
+                       kill_node(store);
+               }
+       }
+
        /* fourth step: create the Store */
        store = new_rd_Store(db, current_ir_graph, block, phiM, ptr, phiD);
 #ifdef DO_CACHEOPT
@@ -1182,8 +1207,7 @@ void optimize_load_store(ir_graph *irg) {
 
        /* Handle graph state */
        if (env.changes) {
-               if (get_irg_outs_state(irg) == outs_consistent)
-                       set_irg_outs_inconsistent(irg);
+               set_irg_outs_inconsistent(irg);
        }
 
        if (env.changes & CF_CHANGED) {