From 940569b4717ba5e6f9faca6682ae30e68e253660 Mon Sep 17 00:00:00 2001 From: David Majnemer Date: Tue, 13 Jan 2015 09:55:56 +0000 Subject: [PATCH] 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. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@225780 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/Sema/SemaDecl.cpp | 6 ++---- test/Sema/private-extern.c | 4 ++++ 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp index baa6822da7..82ffd4da5f 100644 --- a/lib/Sema/SemaDecl.cpp +++ b/lib/Sema/SemaDecl.cpp @@ -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(); diff --git a/test/Sema/private-extern.c b/test/Sema/private-extern.c index 0c13c92bba..94afd87fbb 100644 --- a/test/Sema/private-extern.c +++ b/test/Sema/private-extern.c @@ -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}} +} -- 2.40.0