diff options
| author | dim <dim@FreeBSD.org> | 2012-12-22 15:00:54 +0000 |
|---|---|---|
| committer | dim <dim@FreeBSD.org> | 2012-12-22 15:00:54 +0000 |
| commit | 5b20025c30d23d521e12c1f33ec8fa6b821952cd (patch) | |
| tree | d97cbb4c3a7d0c7da83f0baa1fa220f188e9c6df /lib/Sema | |
| parent | 056abd2059c65a3e908193aeae16fad98017437c (diff) | |
| download | FreeBSD-src-5b20025c30d23d521e12c1f33ec8fa6b821952cd.zip FreeBSD-src-5b20025c30d23d521e12c1f33ec8fa6b821952cd.tar.gz | |
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
Diffstat (limited to 'lib/Sema')
| -rw-r--r-- | lib/Sema/IdentifierResolver.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
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; } |
