diff --git a/clang/lib/AST/ExprConstant.cpp b/clang/lib/AST/ExprConstant.cpp index 55ed550a1e7a..02639679a40a 100644 --- a/clang/lib/AST/ExprConstant.cpp +++ b/clang/lib/AST/ExprConstant.cpp @@ -137,7 +137,7 @@ namespace { /// Given an expression, determine the type used to store the result of /// evaluating that expression. - static QualType getStorageType(ASTContext &Ctx, Expr *E) { + static QualType getStorageType(const ASTContext &Ctx, const Expr *E) { if (E->isRValue()) return E->getType(); return Ctx.getLValueReferenceType(E->getType()); @@ -13569,10 +13569,8 @@ bool Expr::EvaluateAsConstantExpr(EvalResult &Result, ConstExprUsage Usage, if (!Info.discardCleanups()) llvm_unreachable("Unhandled cleanup; missing full expression marker?"); - QualType T = getType(); - if (!isRValue()) - T = Ctx.getLValueReferenceType(T); - return CheckConstantExpression(Info, getExprLoc(), T, Result.Val, Usage) && + return CheckConstantExpression(Info, getExprLoc(), getStorageType(Ctx, this), + Result.Val, Usage) && CheckMemoryLeaks(Info); }