maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Fix the diagnostic when we are shadowing an external variable and there exists a locally scoped extern with the same name. 

llvm-svn: 124580
This commit is contained in:
Argyrios Kyrtzidis 2011-01-31 07:04:50 +00:00
parent 819f610942
commit 857dd06605
2 changed files with 30 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
clang/lib/Sema/SemaDecl.cpp
View File

@ -3129,21 +3129,32 @@ void Sema::CheckShadow(Scope *S, VarDecl *D, const LookupResult& R) {
if (!isa<VarDecl>(ShadowedDecl) && !isa<FieldDecl>(ShadowedDecl))
return;
DeclContext *OldDC = ShadowedDecl->getDeclContext();
// Don't warn for this case:
//
// @code
// extern int bob;
// void f() {
// extern int bob;
// }
// @endcode
if (D->isExternC() && NewDC->isFunctionOrMethod())
if (VarDecl *shadowedVar = dyn_cast<VarDecl>(ShadowedDecl))
if (shadowedVar->isExternC())
if (VarDecl *shadowedVar = dyn_cast<VarDecl>(ShadowedDecl))
if (shadowedVar->isExternC()) {
// Don't warn for this case:
//
// @code
// extern int bob;
// void f() {
// extern int bob;
// }
// @endcode
if (D->isExternC())
return;
// For shadowing external vars, make sure that we point to the global
// declaration, not a locally scoped extern declaration.
for (VarDecl::redecl_iterator
I = shadowedVar->redecls_begin(), E = shadowedVar->redecls_end();
I != E; ++I)
if (I->isFileVarDecl()) {
ShadowedDecl = *I;
break;
}
}
DeclContext *OldDC = ShadowedDecl->getDeclContext();
// Only warn about certain kinds of shadowing for class members.
if (NewDC && NewDC->isRecord()) {
// In particular, don't warn about shadowing non-class members.

7
clang/test/Sema/warn-shadow.c
View File

@ -49,8 +49,13 @@ void test5(int i);
void test6(void (*f)(int i)) {}
void test7(void *context, void (*callback)(void *context)) {}
extern int bob; // expected-note {{previous declaration is here}}
// rdar://8883302
extern int bob;
void rdar8883302() {
extern int bob; // don't warn for shadowing.
}
void test8() {
int bob; // expected-warning {{declaration shadows a variable in the global scope}}
}