It's OK to try to emit a vtable definition more than once. Fixes PR5697.
llvm-svn: 90751
diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index d227a5e..bca893e 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -1400,8 +1400,13 @@
void CGVtableInfo::GenerateClassData(llvm::GlobalVariable::LinkageTypes Linkage,
const CXXRecordDecl *RD) {
- assert(!Vtables.count(RD) && "Vtable has already been generated!");
- Vtables[RD] = GenerateVtable(Linkage, /*GenerateDefinition=*/true, RD, RD, 0);
+ llvm::GlobalVariable *&Vtable = Vtables[RD];
+ if (Vtable) {
+ assert(Vtable->getInitializer() && "Vtable doesn't have a definition!");
+ return;
+ }
+
+ Vtable = GenerateVtable(Linkage, /*GenerateDefinition=*/true, RD, RD, 0);
CGM.GenerateRTTI(RD);
GenerateVTT(Linkage, RD);