commit bb5008a32ac913144ba8721eb99f09f55389de3b
author Eli Friedman <eli.friedman@gmail.com> Tue Dec 08 06:46:18 2009 +0000
committer Eli Friedman <eli.friedman@gmail.com> Tue Dec 08 06:46:18 2009 +0000
tree 299ecfe69ea241bb3dc6ea6bbde4db0f179cc6bb
parent 897bc033056c5d6933a45a576a4bc3133e618f97

Fix for PR5707: make sure implicit copy constructors initialize the vtable
pointer.

llvm-svn: 90840

clang/lib/CodeGen/CGCXX.cpp

diff --git a/clang/lib/CodeGen/CGCXX.cpp b/clang/lib/CodeGen/CGCXX.cpp
index 0b77584..bd166d0 100644
--- a/clang/lib/CodeGen/CGCXX.cpp
+++ b/clang/lib/CodeGen/CGCXX.cpp
@@ -1572,6 +1572,8 @@
       EmitAggregateCopy(LHS.getAddress(), RHS.getAddress(), Field->getType());
     }
   }
+
+  InitializeVtablePtrs(ClassDecl);
   FinishFunction();
 }
 
@@ -1812,6 +1814,10 @@
       PopCXXTemporary();
   }
 
+  InitializeVtablePtr(ClassDecl);
+}
+
+void CodeGenFunction::InitializeVtablePtrs(const CXXRecordDecl *ClassDecl) {
   if (!ClassDecl->isDynamicClass())
     return;
   

clang/lib/CodeGen/CodeGenFunction.h

diff --git a/clang/lib/CodeGen/CodeGenFunction.h b/clang/lib/CodeGen/CodeGenFunction.h
index ead2b5d..854eb53 100644
--- a/clang/lib/CodeGen/CodeGenFunction.h
+++ b/clang/lib/CodeGen/CodeGenFunction.h
@@ -468,6 +468,8 @@
 
   void EmitCtorPrologue(const CXXConstructorDecl *CD, CXXCtorType Type);
 
+  void InitializeVtablePtrs(const CXXRecordDecl *ClassDecl);
+
   void SynthesizeCXXCopyConstructor(const CXXConstructorDecl *Ctor,
                                     CXXCtorType Type,
                                     llvm::Function *Fn,

clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp

diff --git a/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp b/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
new file mode 100644
index 0000000..b4add46
--- /dev/null
+++ b/clang/test/CodeGenCXX/copy-constructor-synthesis-2.cpp
@@ -0,0 +1,7 @@
+// RUN: clang-cc -emit-llvm -o - %s | FileCheck %s
+
+struct A { virtual void a(); };
+A x(A& y) { return y; }
+
+// CHECK: define linkonce_odr void @_ZN1AC1ERKS_(
+// CHECK: store i8** getelementptr inbounds ([3 x i8*]* @_ZTV1A, i64 0, i64 2)