maxjhandsome
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Releases Wiki Activity

Factor out some duplication. NFC. 

llvm-svn: 374130
This commit is contained in:
Richard Smith 2019-10-08 23:37:49 +00:00
parent 8f7a32043d
commit 5769440b5c
1 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
clang/lib/AST/ExprConstant.cpp
View File

@ -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);
}