[cfe-commits] r91069 - in /cfe/trunk: lib/CodeGen/CodeGenModule.cpp test/CodeGenCXX/template-linkage.cpp

[Anders Carlsson]

Author: andersca
Date: Thu Dec 10 16:25:34 2009
New Revision: 91069

URL: http://llvm.org/viewvc/llvm-project?rev=91069&view=rev
Log:
Make sure that explicitly instantiated functions get the right linkage.

Added:
    cfe/trunk/test/CodeGenCXX/template-linkage.cpp
Modified:
    cfe/trunk/lib/CodeGen/CodeGenModule.cpp

Modified: cfe/trunk/lib/CodeGen/CodeGenModule.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/CodeGen/CodeGenModule.cpp?rev=91069&r1=91068&r2=91069&view=diff

==============================================================================
--- cfe/trunk/lib/CodeGen/CodeGenModule.cpp (original)
+++ cfe/trunk/lib/CodeGen/CodeGenModule.cpp Thu Dec 10 16:25:34 2009
@@ -256,9 +256,18 @@
   // The kind of external linkage this function will have, if it is not
   // inline or static.
   CodeGenModule::GVALinkage External = CodeGenModule::GVA_StrongExternal;
-  if (Context.getLangOptions().CPlusPlus &&
-      FD->getTemplateSpecializationKind() == TSK_ImplicitInstantiation)
-    External = CodeGenModule::GVA_TemplateInstantiation;
+  if (Context.getLangOptions().CPlusPlus) {
+    TemplateSpecializationKind TSK = FD->getTemplateSpecializationKind();
+    
+    if (TSK == TSK_ExplicitInstantiationDefinition) {
+      // If a function has been explicitly instantiated, then it should
+      // always have strong external linkage.
+      return CodeGenModule::GVA_StrongExternal;
+    } 
+    
+    if (TSK == TSK_ImplicitInstantiation)
+      External = CodeGenModule::GVA_TemplateInstantiation;
+  }
 
   if (!FD->isInlined())
     return External;

Added: cfe/trunk/test/CodeGenCXX/template-linkage.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/CodeGenCXX/template-linkage.cpp?rev=91069&view=auto

==============================================================================
--- cfe/trunk/test/CodeGenCXX/template-linkage.cpp (added)
+++ cfe/trunk/test/CodeGenCXX/template-linkage.cpp Thu Dec 10 16:25:34 2009
@@ -0,0 +1,24 @@
+// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+template<typename T> struct A {
+  virtual void f(T) { }
+  inline void g() { } 
+};
+
+// Explicit instantiations have external linkage.
+
+// CHECK: define void @_ZN1AIiE1gEv(
+template void A<int>::g();
+
+// CHECK: define void @_ZN1AIfE1fEf(
+// CHECK: define void @_ZN1AIfE1gEv(
+// FIXME: This should also emit the vtable.
+template struct A<float>;
+
+// CHECK: define void @_Z1fIiEvT_
+template <typename T> void f(T) { }
+template void f<int>(int);
+
+// CHECK: define void @_Z1gIiEvT_
+template <typename T> inline void g(T) { }
+template void g<int>(int);
+