From: Jan Hubicka <hubicka@gcc.gnu.org>
Date: Thu, 25 Sep 2014 02:11:13 +0000 (+0000)
Subject: Fix previous commit.
X-Git-Url: https://git.libre-soc.org/?a=commitdiff_plain;h=00d31d5e9fb1d309347ede4561f9165e59aa7f77;p=gcc.git

Fix previous commit.

From-SVN: r215576
---

diff --git a/gcc/ipa-devirt.c b/gcc/ipa-devirt.c
index 954cd540987..bc94a79d038 100644
--- a/gcc/ipa-devirt.c
+++ b/gcc/ipa-devirt.c
@@ -2057,14 +2057,15 @@ ipa_polymorphic_call_context::restrict_to_inner_class (tree expected_type)
   tree type = outer_type;
   HOST_WIDE_INT cur_offset = offset;
   bool speculative = false;
+  bool size_unknown = false;
 
- /* Update OUTER_TYPE to match EXPECTED_TYPE if it is not set.  */
- if (!outer_type)
-   {
-     clear_outer_type (expected_type);
-     type = expected_type;
-     cur_offset = 0;
-   }
+  /* Update OUTER_TYPE to match EXPECTED_TYPE if it is not set.  */
+  if (!outer_type)
+    {
+      clear_outer_type (expected_type);
+      type = expected_type;
+      cur_offset = 0;
+    }
  /* See if OFFSET points inside OUTER_TYPE.  If it does not, we know
     that the context is either invalid, or the instance type must be
     derived from OUTER_TYPE.
@@ -2133,7 +2134,6 @@ ipa_polymorphic_call_context::restrict_to_inner_class (tree expected_type)
     {
       HOST_WIDE_INT pos, size;
       tree fld;
-      bool size_unknown;
 
       /* If we do not know size of TYPE, we need to be more conservative
          about accepting cases where we can not find EXPECTED_TYPE.