commit ec24b0ed9ccf8b34986eadeb98dd0b4a0a50f6f2
author Eli Friedman <eli.friedman@gmail.com> Sun Aug 14 04:50:34 2011 +0000
committer Eli Friedman <eli.friedman@gmail.com> Sun Aug 14 04:50:34 2011 +0000
tree 8cb806552693d0f929d8b90d7597ea6836696445
parent af0f4d0b2e38c810effc8b024ad2fb6604eec5d3

Fix r137086 to actually work properly in general.  PR10650.



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

lib/CodeGen/CGExprScalar.cpp

diff --git a/lib/CodeGen/CGExprScalar.cpp b/lib/CodeGen/CGExprScalar.cpp
index 4038be2..f4a2695 100644
--- a/lib/CodeGen/CGExprScalar.cpp
+++ b/lib/CodeGen/CGExprScalar.cpp
@@ -344,8 +344,7 @@
     
   // C++
   Value *VisitMaterializeTemporaryExpr(const MaterializeTemporaryExpr *E) {
-    RValue RV = CGF.EmitLoadOfLValue(CGF.EmitLValue(E->GetTemporaryExpr()));
-    return RV.getScalarVal();
+    return EmitLoadOfLValue(E);
   }
     
   Value *VisitCXXDefaultArgExpr(CXXDefaultArgExpr *DAE) {