1 files changed, 7 insertions, 8 deletions

diff --git a/lib/CodeGen/CGTemporaries.cpp b/lib/CodeGen/CGTemporaries.cpp
index bed843966e620..6d38ab98dee6d 100644
--- a/lib/CodeGen/CGTemporaries.cpp
+++ b/lib/CodeGen/CGTemporaries.cpp
@@ -127,15 +127,14 @@ CodeGenFunction::EmitCXXExprWithTemporaries(const CXXExprWithTemporaries *E,
   size_t CleanupStackDepth = CleanupEntries.size();
   (void) CleanupStackDepth;
 
-  unsigned OldNumLiveTemporaries = LiveTemporaries.size();
-
-  RValue RV = EmitAnyExpr(E->getSubExpr(), AggLoc, IsAggLocVolatile,
-                          /*IgnoreResult=*/false, IsInitializer);
-
-  // Pop temporaries.
-  while (LiveTemporaries.size() > OldNumLiveTemporaries)
-    PopCXXTemporary();
+  RValue RV;
+  
+  {
+    CXXTemporariesCleanupScope Scope(*this);
 
+    RV = EmitAnyExpr(E->getSubExpr(), AggLoc, IsAggLocVolatile,
+                     /*IgnoreResult=*/false, IsInitializer);
+  }
   assert(CleanupEntries.size() == CleanupStackDepth &&
          "Cleanup size mismatch!");