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.

git-svn-id: svn+ssh://gcc.gnu.org/svn/gcc/trunk@158522 138bc75d-0d04-0410-961f-82ee72b054a4

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5ea39c1..7d1fd3b 100644 (file)
--- 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
 2010-04-19  Richard Guenther  <rguenther@suse.de>
 
        PR tree-optimization/43796

diff --git a/gcc/cgraphunit.c b/gcc/cgraphunit.c
index b91e218..12e8c3f 100644 (file)
--- a/gcc/cgraphunit.c
+++ b/gcc/cgraphunit.c
@@ -2344,6 +2344,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);
 
   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);
 
   /* Update EH information too, just in case.  */
   maybe_clean_or_replace_eh_stmt (e->call_stmt, new_stmt);


@@ -2446,6 +2447,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);
         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
        pop_cfun ();
        current_function_decl = NULL;
 #ifdef ENABLE_CHECKING