replica
/
hanchenye-llvm-project
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Handle redeclarations of catch variables in catch blocks. 

Fix to regression caused by r167650, caught by Richard Smith in code review.

llvm-svn: 167653
This commit is contained in:
David Blaikie 2012-11-10 01:38:24 +00:00
parent 9268c94b15
commit 43df4cc568
2 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
clang/lib/Sema/IdentifierResolver.cpp
View File

@ -138,8 +138,11 @@ bool IdentifierResolver::isDeclInScope(Decl *D, DeclContext *Ctx,
if (S->getFlags() & Scope::FnTryScope)
return S->getParent()->isDeclScope(D);
if (S->getParent()->getFlags() & Scope::ControlScope) {
if (S->getParent()->getFlags() & Scope::FnCatchScope)
if (S->getParent()->getFlags() & Scope::FnCatchScope) {
S = S->getParent();
if (S->isDeclScope(D))
return true;
}
return S->getParent()->isDeclScope(D);
}
}

12
clang/test/CXX/basic/basic.scope/basic.scope.local/p2.cpp
View File

@ -23,3 +23,15 @@ void func5() try {
} catch (...) {
int j = i; // expected-error{{use of undeclared identifier 'i'}}
}
void func6() try {
} catch (int i) { // expected-note{{previous definition is here}}
int i; // expected-error{{redefinition of 'i'}}
}
void func7() {
try {
} catch (int i) { // expected-note{{previous definition is here}}
int i; // expected-error{{redefinition of 'i'}}
}
}