commit e11f9ce9dcc0ecab36bfbd41b0d305fedbf0aa59
author Anders Carlsson <andersca@mac.com> Sun May 02 23:20:53 2010 +0000
committer Anders Carlsson <andersca@mac.com> Sun May 02 23:20:53 2010 +0000
tree 1e0f35bb6f02bc0a0e18c15b0ef13ce038a46ac4
parent 4c638f1217df296ffdb1599dd938568cd38f3df3

Revert my last change and add a 'ForVirtualBase' parameter to EmitCXXConstructorCall instead.

llvm-svn: 102881

clang/lib/CodeGen/CGClass.cpp

diff --git a/clang/lib/CodeGen/CGClass.cpp b/clang/lib/CodeGen/CGClass.cpp
index 27eb1d7..9e96727 100644
--- a/clang/lib/CodeGen/CGClass.cpp
+++ b/clang/lib/CodeGen/CGClass.cpp
@@ -1085,7 +1085,7 @@
   {
     CXXTemporariesCleanupScope Scope(*this);
 
-    EmitCXXConstructorCall(D, CXXConstructExpr::CK_Complete, Address,
+    EmitCXXConstructorCall(D, Ctor_Complete, /*ForVirtualBase=*/false, Address,
                            ArgBeg, ArgEnd);
   }
 
@@ -1223,13 +1223,10 @@
 
 void
 CodeGenFunction::EmitCXXConstructorCall(const CXXConstructorDecl *D,
-                                        CXXConstructExpr::ConstructionKind Kind,
+                                        CXXCtorType Type, bool ForVirtualBase,
                                         llvm::Value *This,
                                         CallExpr::const_arg_iterator ArgBeg,
                                         CallExpr::const_arg_iterator ArgEnd) {
-  CXXCtorType Type = 
-    (Kind == CXXConstructExpr::CK_Complete) ? Ctor_Complete : Ctor_Base;
-  
   if (D->isTrivial()) {
     if (ArgBeg == ArgEnd) {
       // Trivial default constructor, no codegen required.