commit 342aadcf3e1dbc6f18b8d55018450ba8965f300f
author Anders Carlsson <andersca@mac.com> Sun May 03 17:47:16 2009 +0000
committer Anders Carlsson <andersca@mac.com> Sun May 03 17:47:16 2009 +0000
tree bc7a79f24863f33a26b55ec46c1cf26eff46b721
parent 5f0e403d2f136fba691d670b97d473ac13629858

Make codegen for constructors work again.

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70785 91177308-0d34-0410-b5e6-96231b3b80d8

lib/CodeGen/CGCXX.cpp

diff --git a/lib/CodeGen/CGCXX.cpp b/lib/CodeGen/CGCXX.cpp
index 2cb76ab..54a3e59 100644
--- a/lib/CodeGen/CGCXX.cpp
+++ b/lib/CodeGen/CGCXX.cpp
@@ -139,21 +139,9 @@
            CGM.GetAddrOfCXXConstructor(D, Type), Args, D);
 }
 
-LValue 
-CodeGenFunction::EmitCXXTemporaryObjectExprLValue(
-                                              const CXXTemporaryObjectExpr *E) {
-  // Allocate the destination.
-  llvm::Value *Dest = CreateTempAlloca(ConvertType(E->getType()), "tmp");
-  
-  EmitCXXTemporaryObjectExpr(Dest, E);
-  
-  return LValue::MakeAddr(Dest, E->getType().getCVRQualifiers(),
-                          getContext().getObjCGCAttrKind(E->getType()));
-}
-
 void 
-CodeGenFunction::EmitCXXTemporaryObjectExpr(llvm::Value *Dest, 
-                                            const CXXTemporaryObjectExpr *E) {
+CodeGenFunction::EmitCXXConstructExpr(llvm::Value *Dest, 
+                                      const CXXConstructExpr *E) {
   assert(Dest && "Must have a destination!");
   
   const CXXRecordDecl *RD = 

lib/CodeGen/CGExpr.cpp

diff --git a/lib/CodeGen/CGExpr.cpp b/lib/CodeGen/CGExpr.cpp
index 86993fb..2bcb362 100644
--- a/lib/CodeGen/CGExpr.cpp
+++ b/lib/CodeGen/CGExpr.cpp
@@ -193,8 +193,6 @@
   case Expr::CXXReinterpretCastExprClass:
   case Expr::CXXConstCastExprClass:
     return EmitCastLValue(cast<CastExpr>(E));
-  case Expr::CXXTemporaryObjectExprClass:
-    return EmitCXXTemporaryObjectExprLValue(cast<CXXTemporaryObjectExpr>(E));
   }
 }
 

lib/CodeGen/CGExprAgg.cpp

diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index a747412..6fc1988 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -98,7 +98,7 @@
   void VisitCXXDefaultArgExpr(CXXDefaultArgExpr *DAE) {
     Visit(DAE->getExpr());
   }
-  void VisitCXXTemporaryObjectExpr(const CXXTemporaryObjectExpr *E);
+  void VisitCXXConstructExpr(const CXXConstructExpr *E);
   void VisitVAArgExpr(VAArgExpr *E);
 
   void EmitInitializationToLValue(Expr *E, LValue Address);
@@ -294,15 +294,10 @@
 }
 
 void
-AggExprEmitter::VisitCXXTemporaryObjectExpr(const CXXTemporaryObjectExpr *E) {
-  llvm::Value *This = 0;
+AggExprEmitter::VisitCXXConstructExpr(const CXXConstructExpr *E) {
+  assert(DestPtr && "Must have a dest to emit into!");
   
-  if (DestPtr)
-    This = DestPtr;
-  else 
-    This = CGF.CreateTempAlloca(CGF.ConvertType(E->getType()), "tmp");
-  
-  CGF.EmitCXXTemporaryObjectExpr(This, E);
+  CGF.EmitCXXConstructExpr(DestPtr, E);
 }
 
 void AggExprEmitter::EmitInitializationToLValue(Expr* E, LValue LV) {

lib/CodeGen/CodeGenFunction.h

diff --git a/lib/CodeGen/CodeGenFunction.h b/lib/CodeGen/CodeGenFunction.h
index 3db7a2e..04c0026 100644
--- a/lib/CodeGen/CodeGenFunction.h
+++ b/lib/CodeGen/CodeGenFunction.h
@@ -643,7 +643,6 @@
   LValue EmitBlockDeclRefLValue(const BlockDeclRefExpr *E);
 
   LValue EmitCXXConditionDeclLValue(const CXXConditionDeclExpr *E);
-  LValue EmitCXXTemporaryObjectExprLValue(const CXXTemporaryObjectExpr *E);
 
   LValue EmitObjCMessageExprLValue(const ObjCMessageExpr *E);
   LValue EmitObjCIvarRefLValue(const ObjCIvarRefExpr *E);
@@ -756,8 +755,7 @@
   void GenerateStaticCXXBlockVarDeclInit(const VarDecl &D,
                                          llvm::GlobalVariable *GV);
 
-  void EmitCXXTemporaryObjectExpr(llvm::Value *Dest, 
-                                  const CXXTemporaryObjectExpr *E);
+  void EmitCXXConstructExpr(llvm::Value *Dest, const CXXConstructExpr *E);
   
   //===--------------------------------------------------------------------===//
   //                             Internal Helpers