2 files changed, 22 insertions, 2 deletions
diff --git a/lib/CodeGen/CGExprAgg.cpp b/lib/CodeGen/CGExprAgg.cpp
index b216cf70a4..92e535a5f0 100644
--- a/lib/CodeGen/CGExprAgg.cpp
+++ b/lib/CodeGen/CGExprAgg.cpp
@@ -99,6 +99,8 @@ public:
     Visit(DAE->getExpr());
   }
   void VisitCXXConstructExpr(const CXXConstructExpr *E);
+  void VisitCXXExprWithTemporaries(CXXExprWithTemporaries *E);
+
   void VisitVAArgExpr(VAArgExpr *E);
 
   void EmitInitializationToLValue(Expr *E, LValue Address);
@@ -295,9 +297,22 @@ void AggExprEmitter::VisitVAArgExpr(VAArgExpr *VE) {
 
 void
 AggExprEmitter::VisitCXXConstructExpr(const CXXConstructExpr *E) {
-  assert(DestPtr && "Must have a dest to emit into!");
+  llvm::Value *V = DestPtr;
+  
+  if (!V) {
+    assert(isa<CXXTempVarDecl>(E->getVarDecl()) && 
+           "Must have a temp var decl when there's no destination!");
+    
+    V = CGF.CreateTempAlloca(CGF.ConvertType(E->getVarDecl()->getType()), 
+                             "tmpvar");
+  }
   
-  CGF.EmitCXXConstructExpr(DestPtr, E);
+  CGF.EmitCXXConstructExpr(V, E);
+}
+
+void AggExprEmitter::VisitCXXExprWithTemporaries(CXXExprWithTemporaries *E) {
+  // FIXME: Do something with the temporaries!
+  Visit(E->getSubExpr());
 }
 
 void AggExprEmitter::EmitInitializationToLValue(Expr* E, LValue LV) {
diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 5e0159e597..6ceb2a6790 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -269,6 +269,11 @@ public:
     return CGF.LoadCXXThis();
   }      
     
+  Value *VisitCXXExprWithTemporaries(CXXExprWithTemporaries *E) {
+    // FIXME: Do something with the temporaries!
+    return Visit(E->getSubExpr());
+  }
+      
   // Binary Operators.
   Value *EmitMul(const BinOpInfo &Ops) {
     if (CGF.getContext().getLangOptions().OverflowChecking