From 41b1d6ba40a5c856f3d0bfed1b825154f87b6127 Mon Sep 17 00:00:00 2001
From: Douglas Gregor <dgregor@apple.com>
Date: Mon, 19 Apr 2010 21:31:25 +0000
Subject: [PATCH] Disable the "'extern' variable has an initializer" warning in
 C++, since it makes sense there to have const extern variables. Fixes PR6495.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@101818 91177308-0d34-0410-b5e6-96231b3b80d8
---
 lib/Sema/SemaDecl.cpp          | 3 ++-
 test/SemaCXX/storage-class.cpp | 2 ++
 2 files changed, 4 insertions(+), 1 deletion(-)
 create mode 100644 test/SemaCXX/storage-class.cpp

diff --git a/lib/Sema/SemaDecl.cpp b/lib/Sema/SemaDecl.cpp
index 182a85aee8..045b3e8c38 100644
--- a/lib/Sema/SemaDecl.cpp
+++ b/lib/Sema/SemaDecl.cpp
@@ -3818,7 +3818,8 @@ void Sema::AddInitializerToDecl(DeclPtrTy dcl, ExprArg init, bool DirectInit) {
       }
     }
   } else if (VDecl->isFileVarDecl()) {
-    if (VDecl->getStorageClass() == VarDecl::Extern)
+    if (VDecl->getStorageClass() == VarDecl::Extern && 
+        !getLangOptions().CPlusPlus)
       Diag(VDecl->getLocation(), diag::warn_extern_init);
     if (!VDecl->isInvalidDecl()) {
       InitializationSequence InitSeq(*this, Entity, Kind, &Init, 1);
diff --git a/test/SemaCXX/storage-class.cpp b/test/SemaCXX/storage-class.cpp
new file mode 100644
index 0000000000..a31e67be7e
--- /dev/null
+++ b/test/SemaCXX/storage-class.cpp
@@ -0,0 +1,2 @@
+// RUN: %clang_cc1 -fsyntax-only -verify %s
+extern const int PR6495 = 42;