Give MaterializeTemporaryExpr the exact type of the lvalue it binds

to, including cv-qualifications.

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

diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h
index aec2c6a8bfd4588490ee218d46fcf5de575d7db3..5cc5ee11a47e801efe2a3f96db8814d9fc99e977 100644 (file)
--- a/include/clang/AST/ExprCXX.h
+++ b/include/clang/AST/ExprCXX.h
@@ -3013,8 +3013,9 @@ class MaterializeTemporaryExpr : public Expr {
   friend class ASTStmtWriter;
   
 public:
-  MaterializeTemporaryExpr(Expr *Temporary, bool BoundToLvalueReference)
-    : Expr(MaterializeTemporaryExprClass, Temporary->getType(),
+  MaterializeTemporaryExpr(QualType T, Expr *Temporary, 
+                           bool BoundToLvalueReference)
+    : Expr(MaterializeTemporaryExprClass, T,
            BoundToLvalueReference? VK_LValue : VK_XValue, OK_Ordinary,
            Temporary->isTypeDependent(), Temporary->isValueDependent(),
            Temporary->containsUnexpandedParameterPack()),

diff --git a/lib/Sema/SemaInit.cpp b/lib/Sema/SemaInit.cpp
index 3231455f5a5c07712eee42b5c8353cd1270e48fb..e93d2d83cdfa2e0223b6141e6161b286f9153f79 100644 (file)
--- a/lib/Sema/SemaInit.cpp
+++ b/lib/Sema/SemaInit.cpp
@@ -4080,7 +4080,9 @@ InitializationSequence::Perform(Sema &S,
         return ExprError();
 
       // Materialize the temporary into memory.
-      CurInit = new (S.Context) MaterializeTemporaryExpr(CurInit.get(),
+      CurInit = new (S.Context) MaterializeTemporaryExpr(
+                                         Entity.getType().getNonReferenceType(),
+                                                         CurInit.get(),
                                      Entity.getType()->isLValueReferenceType());
       break;