[cfe-commits] r71962 - in /cfe/trunk: lib/Sema/SemaDecl.cpp test/SemaCXX/linkage-spec.cpp

[Anders Carlsson]

Author: andersca
Date: Sat May 16 17:05:23 2009
New Revision: 71962

URL: http://llvm.org/viewvc/llvm-project?rev=71962&view=rev
Log:
Fix another case where the extern-ness of extern "C" wasn't being captured. 

This makes me think that we should make hasExternalStorage perform this check...


Modified:
    cfe/trunk/lib/Sema/SemaDecl.cpp
    cfe/trunk/test/SemaCXX/linkage-spec.cpp

Modified: cfe/trunk/lib/Sema/SemaDecl.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Sema/SemaDecl.cpp?rev=71962&r1=71961&r2=71962&view=diff

==============================================================================
--- cfe/trunk/lib/Sema/SemaDecl.cpp (original)
+++ cfe/trunk/lib/Sema/SemaDecl.cpp Sat May 16 17:05:23 2009
@@ -2703,7 +2703,8 @@
       QualType InitType = Type;
       if (const ArrayType *Array = Context.getAsArrayType(Type))
         InitType = Array->getElementType();
-      if (!Var->hasExternalStorage() && InitType->isRecordType()) {
+      if ((!Var->hasExternalStorage() && !Var->isExternC(Context)) &&
+           InitType->isRecordType()) {
         CXXRecordDecl *RD = 
           cast<CXXRecordDecl>(InitType->getAsRecordType()->getDecl());
         CXXConstructorDecl *Constructor = 0;

Modified: cfe/trunk/test/SemaCXX/linkage-spec.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaCXX/linkage-spec.cpp?rev=71962&r1=71961&r2=71962&view=diff

==============================================================================
--- cfe/trunk/test/SemaCXX/linkage-spec.cpp (original)
+++ cfe/trunk/test/SemaCXX/linkage-spec.cpp Sat May 16 17:05:23 2009
@@ -21,3 +21,7 @@
 
 extern "C" const int bar;
 extern "C" int const bar;
+
+// <rdar://problem/6895431>
+extern "C" struct bar d;
+extern struct bar e;