diff options
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/CodeGen/CGVtable.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/CodeGen/CGVtable.cpp b/lib/CodeGen/CGVtable.cpp index 9ed90f0ba5..9c78c23631 100644 --- a/lib/CodeGen/CGVtable.cpp +++ b/lib/CodeGen/CGVtable.cpp @@ -1092,7 +1092,7 @@ createGlobalVariable(CodeGenModule &CGM, const CXXRecordDecl *RD, // 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 @@ llvm::Constant *CodeGenModule::GenerateVtable(const CXXRecordDecl *LayoutClass, 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 = |