commit 571e2ad0429fee7f214361276f502a54b4c5f891
author Anders Carlsson <andersca@mac.com> Mon Jan 24 00:46:19 2011 +0000
committer Anders Carlsson <andersca@mac.com> Mon Jan 24 00:46:19 2011 +0000
tree c4857124518803129cea144822e40553f0a44e1c
parent a960725d18fd8686c517aecf25584a3c5a4da9d6

Mark VTables and RTTI data linkonce_odr instead of weak_odr, with the exception of explicit template instantiations, which have to be weak_odr.

This fixes PR6996.

llvm-svn: 124089

clang/lib/CodeGen/CodeGenModule.cpp

diff --git a/clang/lib/CodeGen/CodeGenModule.cpp b/clang/lib/CodeGen/CodeGenModule.cpp
index 631c335..ae61661 100644
--- a/clang/lib/CodeGen/CodeGenModule.cpp
+++ b/clang/lib/CodeGen/CodeGenModule.cpp
@@ -210,7 +210,7 @@
   // in CGVTables.cpp.
 
   // Preconditions.
-  if (GV->getLinkage() != llvm::GlobalVariable::WeakODRLinkage ||
+  if (GV->getLinkage() != llvm::GlobalVariable::LinkOnceODRLinkage ||
       GV->getVisibility() != llvm::GlobalVariable::DefaultVisibility)
     return;
 
@@ -1053,19 +1053,21 @@
       case TSK_Undeclared:
       case TSK_ExplicitSpecialization:
         if (KeyFunction->isInlined())
-          return llvm::GlobalVariable::WeakODRLinkage;
+          return llvm::GlobalVariable::LinkOnceODRLinkage;
         
         return llvm::GlobalVariable::ExternalLinkage;
         
       case TSK_ImplicitInstantiation:
+        return llvm::GlobalVariable::LinkOnceODRLinkage;
+
       case TSK_ExplicitInstantiationDefinition:
         return llvm::GlobalVariable::WeakODRLinkage;
-        
+  
       case TSK_ExplicitInstantiationDeclaration:
         // FIXME: Use available_externally linkage. However, this currently
         // breaks LLVM's build due to undefined symbols.
         //      return llvm::GlobalVariable::AvailableExternallyLinkage;
-        return llvm::GlobalVariable::WeakODRLinkage;
+        return llvm::GlobalVariable::LinkOnceODRLinkage;
     }
   }
   
@@ -1073,6 +1075,8 @@
   case TSK_Undeclared:
   case TSK_ExplicitSpecialization:
   case TSK_ImplicitInstantiation:
+    return llvm::GlobalVariable::LinkOnceODRLinkage;
+
   case TSK_ExplicitInstantiationDefinition:
     return llvm::GlobalVariable::WeakODRLinkage;
     
@@ -1080,11 +1084,11 @@
     // FIXME: Use available_externally linkage. However, this currently
     // breaks LLVM's build due to undefined symbols.
     //   return llvm::GlobalVariable::AvailableExternallyLinkage;
-    return llvm::GlobalVariable::WeakODRLinkage;
+    return llvm::GlobalVariable::LinkOnceODRLinkage;
   }
   
   // Silence GCC warning.
-  return llvm::GlobalVariable::WeakODRLinkage;
+  return llvm::GlobalVariable::LinkOnceODRLinkage;
 }
 
 CharUnits CodeGenModule::GetTargetTypeStoreSize(const llvm::Type *Ty) const {