From 5b20025c30d23d521e12c1f33ec8fa6b821952cd Mon Sep 17 00:00:00 2001
From: dim <dim@FreeBSD.org>
Date: Sat, 22 Dec 2012 15:00:54 +0000
Subject: Vendor import of clang tags/RELEASE_32/final r170710 (effectively,
 3.2 release):
 http://llvm.org/svn/llvm-project/cfe/tags/RELEASE_32/final@170710

---
 lib/Sema/IdentifierResolver.cpp | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

(limited to 'lib/Sema/IdentifierResolver.cpp')

diff --git a/lib/Sema/IdentifierResolver.cpp b/lib/Sema/IdentifierResolver.cpp
index 0093915..7d55304 100644
--- a/lib/Sema/IdentifierResolver.cpp
+++ b/lib/Sema/IdentifierResolver.cpp
@@ -135,16 +135,13 @@ bool IdentifierResolver::isDeclInScope(Decl *D, DeclContext *Ctx,
       // of the controlled statement.
       //
       assert(S->getParent() && "No TUScope?");
-      if (S->getFlags() & Scope::FnTryScope)
-        return S->getParent()->isDeclScope(D);
       if (S->getParent()->getFlags() & Scope::ControlScope) {
-        if (S->getParent()->getFlags() & Scope::FnCatchScope) {
-          S = S->getParent();
-          if (S->isDeclScope(D))
-            return true;
-        }
-        return S->getParent()->isDeclScope(D);
+        S = S->getParent();
+        if (S->isDeclScope(D))
+          return true;
       }
+      if (S->getFlags() & Scope::FnTryCatchScope)
+        return S->getParent()->isDeclScope(D);
     }
     return false;
   }
-- 
cgit v1.1