Make codegen for constructors work again.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@70785 91177308-0d34-0410-b5e6-96231b3b80d8
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) {