tree-sra.c (modify_function): Record caller nodes after rebuild.

2014-06-03  Teresa Johnson  <tejohnson@google.com>

	* tree-sra.c (modify_function): Record caller nodes after rebuild.

From-SVN: r211180

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 5bc582bb7e3d5392beeacf7e4e4b03feb3d7ac1a..63986c2cedaab698b15e2821814cb384aca25785 100644 (file)
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,7 @@
+2014-06-03  Teresa Johnson  <tejohnson@google.com>
+
+       * tree-sra.c (modify_function): Record caller nodes after rebuild.
+
 2014-06-02  Jason Merrill  <jason@redhat.com>
 
        PR c++/61020

diff --git a/gcc/tree-sra.c b/gcc/tree-sra.c
index db91c8b81753219c6f0274b7dc3c846746a8e4a5..0afa197059c29b1ffee553e7987d91f4c7ea4672 100644 (file)
--- a/gcc/tree-sra.c
+++ b/gcc/tree-sra.c
@@ -4926,12 +4926,15 @@ modify_function (struct cgraph_node *node, ipa_parm_adjustment_vec adjustments)
 {
   struct cgraph_node *new_node;
   bool cfg_changed;
-  vec<cgraph_edge_p> redirect_callers = collect_callers_of_node (node);
 
   rebuild_cgraph_edges ();
   free_dominance_info (CDI_DOMINATORS);
   pop_cfun ();
 
+  /* This must be done after rebuilding cgraph edges for node above.
+     Otherwise any recursive calls to node that are recorded in
+     redirect_callers will be corrupted.  */
+  vec<cgraph_edge_p> redirect_callers = collect_callers_of_node (node);
   new_node = cgraph_function_versioning (node, redirect_callers,
                                         NULL,
                                         NULL, false, NULL, NULL, "isra");