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

Sema: An extern declaration can't be a redeclaration of a parameter 

In the following:
void f(int x) { extern int x; }

The second declaration of 'x' shouldn't be considered a redeclaration of
the parameter.

llvm-svn: 225780
This commit is contained in:
David Majnemer 2015-01-13 09:55:56 +00:00
parent d1136297d3
commit c3691827c0
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3282,14 +3282,12 @@ void Sema::MergeVarDecl(VarDecl *New, LookupResult &Previous) {
}
// Check if extern is followed by non-extern and vice-versa.
if (New->hasExternalStorage() &&
!Old->hasLinkage() && Old->isLocalVarDecl()) {
if (New->hasGlobalStorage() && !Old->hasLinkage() && Old->hasLocalStorage()) {
Diag(New->getLocation(), diag::err_extern_non_extern) << New->getDeclName();
Diag(OldLocation, PrevDiag);
return New->setInvalidDecl();
}
if (Old->hasLinkage() && New->isLocalVarDecl() &&
!New->hasExternalStorage()) {
if (Old->hasGlobalStorage() && !New->hasLinkage() && New->hasLocalStorage()) {
Diag(New->getLocation(), diag::err_non_extern_extern) << New->getDeclName();
Diag(OldLocation, PrevDiag);
return New->setInvalidDecl();

4
clang/test/Sema/private-extern.c
View File

@ -83,3 +83,7 @@ __private_extern__ int g19;
int g19 = 0;
__private_extern__ int g20 = 0;
void f10(int g20) { // expected-note{{previous definition is here}}
extern int g20; // expected-error{{extern declaration of 'g20' follows non-extern declaration}}
}