From: Richard Guenther <rguenther@suse.de>
Date: Tue, 21 Jun 2011 12:07:19 +0000 (+0000)
Subject: ipa-inline-transform.c (inline_transform): Fix previous change.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=55f01229f008b551dc407c0674657953b3adfb83;p=gcc.git

ipa-inline-transform.c (inline_transform): Fix previous change.

2011-06-21  Richard Guenther  <rguenther@suse.de>

	* ipa-inline-transform.c (inline_transform): Fix previous
	change.

From-SVN: r175256
---

diff --git a/gcc/ChangeLog b/gcc/ChangeLog
index 317d05767a6..1685fb2342d 100644
--- a/gcc/ChangeLog
+++ b/gcc/ChangeLog
@@ -1,3 +1,8 @@
+2011-06-21  Richard Guenther  <rguenther@suse.de>
+
+	* ipa-inline-transform.c (inline_transform): Fix previous
+	change.
+
 2011-06-21  Ira Rosen  <ira.rosen@linaro.org>
 
 	PR tree-optimization/49478
diff --git a/gcc/ipa-inline-transform.c b/gcc/ipa-inline-transform.c
index 02d3e6507ad..c329beab3b4 100644
--- a/gcc/ipa-inline-transform.c
+++ b/gcc/ipa-inline-transform.c
@@ -364,13 +364,13 @@ inline_transform (struct cgraph_node *node)
 
   timevar_push (TV_INTEGRATION);
   if (node->callees)
-    {
-      todo = optimize_inline_calls (current_function_decl);
-      /* Redirecting edges might lead to a need for vops to be recomputed.  */
-      todo |= TODO_update_ssa_only_virtuals;
-    }
+    todo = optimize_inline_calls (current_function_decl);
   timevar_pop (TV_INTEGRATION);
 
+  if (!(todo & TODO_update_ssa_any))
+    /* Redirecting edges might lead to a need for vops to be recomputed.  */
+    todo |= TODO_update_ssa_only_virtuals;
+
   cfun->always_inline_functions_inlined = true;
   cfun->after_inlining = true;
   return todo | execute_fixup_cfg ();