From: Jan Hubicka <jh@suse.cz>
Date: Fri, 13 Sep 2013 14:28:03 +0000 (+0200)
Subject: ipa-inline-analysis.c (struct growth_data): Add node.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=a93c18c88fc9aecdf7a63340eb4c22aba05c3983;p=gcc.git

ipa-inline-analysis.c (struct growth_data): Add node.

	* ipa-inline-analysis.c (struct growth_data): Add node.
	(do_estimate_growth_1): Fix detection of recursion.

From-SVN: r202566
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 672c49e92dc..34d39d24534 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2013-09-13  Jan Hubicka  <jh@suse.cz>
+
+	* ipa-inline-analysis.c (struct growth_data): Add node.
+	(do_estimate_growth_1): Fix detection of recursion.
+
 2013-09-13  Jakub Jelinek  <jakub@redhat.com>
 
 	PR tree-optimization/58392
diff --git a/gcc/ipa-inline-analysis.c b/gcc/ipa-inline-analysis.c
index 8cf8253eaca..eaf64d35853 100644
--- a/gcc/ipa-inline-analysis.c
+++ b/gcc/ipa-inline-analysis.c
@@ -3580,6 +3580,7 @@ estimate_size_after_inlining (struct cgraph_node *node,
 
 struct growth_data
 {
+  struct cgraph_node *node;
   bool self_recursive;
   int growth;
 };
@@ -3597,9 +3598,9 @@ do_estimate_growth_1 (struct cgraph_node *node, void *data)
     {
       gcc_checking_assert (e->inline_failed);
 
-      if (e->caller == node
+      if (e->caller == d->node
 	  || (e->caller->global.inlined_to
-	      && e->caller->global.inlined_to == node))
+	      && e->caller->global.inlined_to == d->node))
 	d->self_recursive = true;
       d->growth += estimate_edge_growth (e);
     }
@@ -3612,7 +3613,7 @@ do_estimate_growth_1 (struct cgraph_node *node, void *data)
 int
 do_estimate_growth (struct cgraph_node *node)
 {
-  struct growth_data d = { 0, false };
+  struct growth_data d = { node, 0, false };
   struct inline_summary *info = inline_summary (node);
 
   cgraph_for_node_and_aliases (node, do_estimate_growth_1, &d, true);