aboutsummaryrefslogtreecommitdiff
path: root/gcc/tree-cfgcleanup.c
diff options
context:
space:
mode:
Diffstat (limited to 'gcc/tree-cfgcleanup.c')
-rw-r--r--gcc/tree-cfgcleanup.c8
1 files changed, 6 insertions, 2 deletions
diff --git a/gcc/tree-cfgcleanup.c b/gcc/tree-cfgcleanup.c
index 78583c4..a5fbd75 100644
--- a/gcc/tree-cfgcleanup.c
+++ b/gcc/tree-cfgcleanup.c
@@ -444,7 +444,9 @@ remove_forwarder_block (basic_block bb)
{
gimple phi = gsi_stmt (gsi);
source_location l = gimple_phi_arg_location_from_edge (phi, succ);
- add_phi_arg (phi, gimple_phi_arg_def (phi, succ->dest_idx), s, l);
+ tree b = gimple_phi_arg_block_from_edge (phi, succ);
+ add_phi_arg (phi, gimple_phi_arg_def (phi, succ->dest_idx), s, l,
+ b);
}
}
}
@@ -871,6 +873,7 @@ remove_forwarder_block_with_phi (basic_block bb)
gimple phi = gsi_stmt (gsi);
tree def = gimple_phi_arg_def (phi, succ->dest_idx);
source_location locus = gimple_phi_arg_location_from_edge (phi, succ);
+ tree block = gimple_phi_arg_block_from_edge (phi, succ);
if (TREE_CODE (def) == SSA_NAME)
{
@@ -891,12 +894,13 @@ remove_forwarder_block_with_phi (basic_block bb)
{
def = new_arg;
locus = redirect_edge_var_map_location (vm);
+ block = redirect_edge_var_map_block (vm);
break;
}
}
}
- add_phi_arg (phi, def, s, locus);
+ add_phi_arg (phi, def, s, locus, block);
}
redirect_edge_var_map_clear (e);