[cfe-commits] r77653 - in /cfe/trunk: lib/Sema/SemaTemplate.cpp test/SemaTemplate/nested-linkage.cpp

[Eli Friedman]

Author: efriedma
Date: Thu Jul 30 20:43:05 2009
New Revision: 77653

URL: http://llvm.org/viewvc/llvm-project?rev=77653&view=rev
Log:
Make the check for the linkage of a template handle the case of nested 
linkage specifications correctly.


Added:
    cfe/trunk/test/SemaTemplate/nested-linkage.cpp
Modified:
    cfe/trunk/lib/Sema/SemaTemplate.cpp

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

==============================================================================
--- cfe/trunk/lib/Sema/SemaTemplate.cpp (original)
+++ cfe/trunk/lib/Sema/SemaTemplate.cpp Thu Jul 30 20:43:05 2009
@@ -2123,13 +2123,12 @@
   //   A template-declaration can appear only as a namespace scope or
   //   class scope declaration.
   DeclContext *Ctx = static_cast<DeclContext *>(S->getEntity());
-  while (Ctx && isa<LinkageSpecDecl>(Ctx)) {
-    if (cast<LinkageSpecDecl>(Ctx)->getLanguage() != LinkageSpecDecl::lang_cxx)
-      return Diag(TemplateLoc, diag::err_template_linkage)
-        << TemplateRange;
-
+  if (Ctx && isa<LinkageSpecDecl>(Ctx) &&
+      cast<LinkageSpecDecl>(Ctx)->getLanguage() != LinkageSpecDecl::lang_cxx)
+    return Diag(TemplateLoc, diag::err_template_linkage) << TemplateRange;
+  
+  while (Ctx && isa<LinkageSpecDecl>(Ctx))
     Ctx = Ctx->getParent();
-  }
 
   if (Ctx && (Ctx->isFileContext() || Ctx->isRecord()))
     return false;

Added: cfe/trunk/test/SemaTemplate/nested-linkage.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaTemplate/nested-linkage.cpp?rev=77653&view=auto

==============================================================================
--- cfe/trunk/test/SemaTemplate/nested-linkage.cpp (added)
+++ cfe/trunk/test/SemaTemplate/nested-linkage.cpp Thu Jul 30 20:43:05 2009
@@ -0,0 +1,3 @@
+// RUN: clang-cc -fsyntax-only -verify %s
+
+extern "C" { extern "C++" { template<class C> C x(); } }