revert: tree.h (phi_arg_d): New field.

[thirdparty/gcc.git] / gcc / tree-ssa-phiprop.c

diff --git a/gcc/tree-ssa-phiprop.c b/gcc/tree-ssa-phiprop.c
index 2a52a27fb54f0f99f85a1ebbcf593daf3c4bcb98..306443725644e43a6aa741202c302b788ed11b77 100644 (file)
--- a/gcc/tree-ssa-phiprop.c
+++ b/gcc/tree-ssa-phiprop.c
@@ -159,11 +159,9 @@ phiprop_insert_phi (basic_block bb, gimple phi, gimple use_stmt,
       tree old_arg, new_var;
       gimple tmp;
       source_location locus;
-      tree block;
 
       old_arg = PHI_ARG_DEF_FROM_EDGE (phi, e);
       locus = gimple_phi_arg_location_from_edge (phi, e);
-      block = gimple_phi_arg_block_from_edge (phi, e);
       while (TREE_CODE (old_arg) == SSA_NAME
             && (SSA_NAME_VERSION (old_arg) >= n
                 || phivn[SSA_NAME_VERSION (old_arg)].value == NULL_TREE))
@@ -171,7 +169,6 @@ phiprop_insert_phi (basic_block bb, gimple phi, gimple use_stmt,
          gimple def_stmt = SSA_NAME_DEF_STMT (old_arg);
          old_arg = gimple_assign_rhs1 (def_stmt);
          locus = gimple_location (def_stmt);
-         block = gimple_block (def_stmt);
        }
 
       if (TREE_CODE (old_arg) == SSA_NAME)
@@ -206,7 +203,6 @@ phiprop_insert_phi (basic_block bb, gimple phi, gimple use_stmt,
          new_var = make_ssa_name (new_var, tmp);
          gimple_assign_set_lhs (tmp, new_var);
          gimple_set_location (tmp, locus);
-         gimple_set_block (tmp, block);
 
          gsi_insert_on_edge (e, tmp);
          update_stmt (tmp);
@@ -220,7 +216,7 @@ phiprop_insert_phi (basic_block bb, gimple phi, gimple use_stmt,
            }
        }
 
-      add_phi_arg (new_phi, new_var, e, locus, block);
+      add_phi_arg (new_phi, new_var, e, locus);
     }
 
   update_stmt (new_phi);