commit 891c8b739917ec4d171a62ceaefc640115089e7d
author Anders Carlsson <andersca@mac.com> Sat Dec 05 22:24:38 2009 +0000
committer Anders Carlsson <andersca@mac.com> Sat Dec 05 22:24:38 2009 +0000
tree b58a4e0a2b4993da8304935f50db8929ef975696
parent 152d4dce59a123b9a103b3087dc3be7f0b71033e

If a class does not have a key function, its linkage should be weak_odr.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@90680 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGVtable.cpp

diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp
index 9ed90f0..9c78c23 100644
--- a/lib/CodeGen/CGVtable.cpp
+++ b/lib/CodeGen/CGVtable.cpp
@@ -1092,7 +1092,7 @@
   
   // Figure out the right linkage.
   llvm::GlobalVariable::LinkageTypes Linkage = 
-    llvm::GlobalValue::LinkOnceODRLinkage;
+    llvm::GlobalValue::WeakODRLinkage;
   if (!Init)
     Linkage = llvm::GlobalValue::ExternalLinkage;
   else if (RD->isInAnonymousNamespace())
@@ -1167,7 +1167,7 @@
                                       b.getVtable().size());
     }
     llvm::GlobalVariable *OGV = GV;
-    GV = createGlobalVariable(*this, LayoutClass, ntype, C, Name);
+    GV = createGlobalVariable(*this, LayoutClass, ArrayType, Init, Name);
     if (OGV) {
       GV->takeName(OGV);
       llvm::Constant *NewPtr =