It's OK to try to emit a vtable definition more than once. Fixes PR5697.

llvm-svn: 90751

2 files changed, 22 insertions, 2 deletions

diff --git a/clang/lib/CodeGen/CGVtable.cpp b/clang/lib/CodeGen/CGVtable.cpp
index d227a5e47ef..bca893e5b66 100644
--- a/clang/lib/CodeGen/CGVtable.cpp
+++ b/clang/lib/CodeGen/CGVtable.cpp
@@ -1400,8 +1400,13 @@ CGVtableInfo::GenerateVTT(llvm::GlobalVariable::LinkageTypes Linkage,
 
 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);  
diff --git a/clang/test/CodeGenCXX/vtable-key-function.cpp b/clang/test/CodeGenCXX/vtable-key-function.cpp
new file mode 100644
index 00000000000..b0371c0e0ba
--- /dev/null
+++ b/clang/test/CodeGenCXX/vtable-key-function.cpp
@@ -0,0 +1,15 @@
+// RUN: clang-cc %s -triple=x86_64-apple-darwin10 -emit-llvm -o - | FileCheck %s
+// PR5697
+namespace PR5697 {
+struct A {
+  virtual void f() { } 
+  A();
+  A(int);
+};
+
+// A does not have a key function, so the first constructor we emit should
+// cause the vtable to be defined (without assertions.)
+// CHECK: @_ZTVN6PR56971AE = weak_odr constant
+A::A() { }
+A::A(int) { }
+}