summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--gcc/ChangeLog6
-rw-r--r--gcc/cgraphunit.c2
2 files changed, 8 insertions, 0 deletions
diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 273d492ee93..4e2e9072fd9 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,9 @@
+2010-04-19 Martin Jambor <mjambor@suse.cz>
+
+ * cgraphunit.c (cgraph_redirect_edge_call_stmt_to_callee): Update
+ new_stmt.
+ (cgraph_materialize_all_clones): Assert !need_ssa_update_p.
+
2010-04-19 Richard Guenther <rguenther@suse.de>
PR tree-optimization/43796
diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index 212ab3aa1ab..afcd660ee40 100644
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2260,6 +2260,7 @@ cgraph_redirect_edge_call_stmt_to_callee (struct cgraph_edge *e)
gsi = gsi_for_stmt (e->call_stmt);
gsi_replace (&gsi, new_stmt, true);
+ update_stmt (new_stmt);
/* Update EH information too, just in case. */
maybe_clean_or_replace_eh_stmt (e->call_stmt, new_stmt);
@@ -2363,6 +2364,7 @@ cgraph_materialize_all_clones (void)
push_cfun (DECL_STRUCT_FUNCTION (node->decl));
for (e = node->callees; e; e = e->next_callee)
cgraph_redirect_edge_call_stmt_to_callee (e);
+ gcc_assert (!need_ssa_update_p (cfun));
pop_cfun ();
current_function_decl = NULL;
#ifdef ENABLE_CHECKING