diff options
| -rw-r--r-- | include/clang/AST/ExprCXX.h | 3 | ||||
| -rw-r--r-- | lib/AST/ExprCXX.cpp | 3 | ||||
| -rw-r--r-- | lib/Sema/SemaExprCXX.cpp | 9 |
3 files changed, 11 insertions, 4 deletions
diff --git a/include/clang/AST/ExprCXX.h b/include/clang/AST/ExprCXX.h index 9d3710a2a6..9c948f9f82 100644 --- a/include/clang/AST/ExprCXX.h +++ b/include/clang/AST/ExprCXX.h @@ -480,7 +480,8 @@ class CXXTemporaryObjectExpr : public Expr { unsigned NumArgs; public: - CXXTemporaryObjectExpr(CXXConstructorDecl *Cons, QualType writtenTy, + CXXTemporaryObjectExpr(VarDecl *vd, + CXXConstructorDecl *Cons, QualType writtenTy, SourceLocation tyBeginLoc, Expr **Args, unsigned NumArgs, SourceLocation rParenLoc); diff --git a/lib/AST/ExprCXX.cpp b/lib/AST/ExprCXX.cpp index e0a988bf66..01290d9472 100644 --- a/lib/AST/ExprCXX.cpp +++ b/lib/AST/ExprCXX.cpp @@ -231,7 +231,8 @@ const char *CXXNamedCastExpr::getCastName() const { } } -CXXTemporaryObjectExpr::CXXTemporaryObjectExpr(CXXConstructorDecl *Cons, +CXXTemporaryObjectExpr::CXXTemporaryObjectExpr(VarDecl *vd, + CXXConstructorDecl *Cons, QualType writtenTy, SourceLocation tyBeginLoc, Expr **Args, diff --git a/lib/Sema/SemaExprCXX.cpp b/lib/Sema/SemaExprCXX.cpp index d3a46dc1ac..753d1e47ba 100644 --- a/lib/Sema/SemaExprCXX.cpp +++ b/lib/Sema/SemaExprCXX.cpp @@ -128,7 +128,10 @@ Sema::ActOnCXXTypeConstructExpr(SourceRange TypeRange, TypeTy *TypeRep, if (Ty->isDependentType() || CallExpr::hasAnyTypeDependentArguments(Exprs, NumExprs)) { exprs.release(); - return Owned(new (Context) CXXTemporaryObjectExpr(0, Ty, TyBeginLoc, + + // FIXME: Is this correct? + CXXTempVarDecl *Temp = CXXTempVarDecl::Create(Context, CurContext, Ty); + return Owned(new (Context) CXXTemporaryObjectExpr(Temp, 0, Ty, TyBeginLoc, Exprs, NumExprs, RParenLoc)); } @@ -163,8 +166,10 @@ Sema::ActOnCXXTypeConstructExpr(SourceRange TypeRange, TypeTy *TypeRep, if (!Constructor) return ExprError(); + CXXTempVarDecl *Temp = CXXTempVarDecl::Create(Context, CurContext, Ty); + exprs.release(); - return Owned(new (Context) CXXTemporaryObjectExpr(Constructor, Ty, + return Owned(new (Context) CXXTemporaryObjectExpr(Temp, Constructor, Ty, TyBeginLoc, Exprs, NumExprs, RParenLoc)); } |