diff options
| author | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-12-08 11:45:06 +0100 |
|---|---|---|
| committer | Abdoulaye Walsimou Gaye <awg@embtoolkit.org> | 2012-12-08 11:45:06 +0100 |
| commit | 918a0d4311cc1d1766b579509c16ac9fcfbc7807 (patch) | |
| tree | 208801b1cf6204c078579423f5be51a2ebaa59db /lib/Sema/IdentifierResolver.cpp | |
| parent | bee2507b6a87a0add267d6e846a112a8c468b195 (diff) | |
| parent | 9b65aea27ca3f915d8d197db494b4caccc745d3c (diff) | |
| download | clang-918a0d4311cc1d1766b579509c16ac9fcfbc7807.tar.gz clang-918a0d4311cc1d1766b579509c16ac9fcfbc7807.tar.bz2 clang-918a0d4311cc1d1766b579509c16ac9fcfbc7807.tar.xz | |
Merge branch 'release-3.2' into embtk-support-release-3.2
Diffstat (limited to 'lib/Sema/IdentifierResolver.cpp')
| -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 00939151c6..7d5530442f 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; } |