diff options
| author | Douglas Gregor <dgregor@apple.com> | 2010-04-19 22:34:40 +0000 |
|---|---|---|
| committer | Douglas Gregor <dgregor@apple.com> | 2010-04-19 22:34:40 +0000 |
| commit | f4cd8f4ece29e28e0d503b105432b5b4a1dc4519 (patch) | |
| tree | 90e49edf2d6462f86e76680c5a790d1bb75369e0 /clang | |
| parent | e637ff5e9a884299418c4da192ab88b2d2197f28 (diff) | |
| download | bcm5719-llvm-f4cd8f4ece29e28e0d503b105432b5b4a1dc4519.tar.gz bcm5719-llvm-f4cd8f4ece29e28e0d503b105432b5b4a1dc4519.zip | |
Only suppress the "extern variable has an initializer" warning when the extern entity being initialized is const.
llvm-svn: 101821
Diffstat (limited to 'clang')
| -rw-r--r-- | clang/lib/Sema/SemaDecl.cpp | 2 | ||||
| -rw-r--r-- | clang/test/SemaCXX/storage-class.cpp | 3 |
2 files changed, 3 insertions, 2 deletions
diff --git a/clang/lib/Sema/SemaDecl.cpp b/clang/lib/Sema/SemaDecl.cpp index 045b3e8c381..115b7bf756e 100644 --- a/clang/lib/Sema/SemaDecl.cpp +++ b/clang/lib/Sema/SemaDecl.cpp @@ -3819,7 +3819,7 @@ void Sema::AddInitializerToDecl(DeclPtrTy dcl, ExprArg init, bool DirectInit) { } } else if (VDecl->isFileVarDecl()) { if (VDecl->getStorageClass() == VarDecl::Extern && - !getLangOptions().CPlusPlus) + (!getLangOptions().CPlusPlus || !VDecl->getType().isConstQualified())) Diag(VDecl->getLocation(), diag::warn_extern_init); if (!VDecl->isInvalidDecl()) { InitializationSequence InitSeq(*this, Entity, Kind, &Init, 1); diff --git a/clang/test/SemaCXX/storage-class.cpp b/clang/test/SemaCXX/storage-class.cpp index a31e67be7e4..4025595de12 100644 --- a/clang/test/SemaCXX/storage-class.cpp +++ b/clang/test/SemaCXX/storage-class.cpp @@ -1,2 +1,3 @@ // RUN: %clang_cc1 -fsyntax-only -verify %s -extern const int PR6495 = 42; +extern const int PR6495a = 42; +extern int PR6495b = 42; // expected-warning{{'extern' variable has an initializer}} |
