diff options
| -rw-r--r-- | lib/Sema/SemaExpr.cpp | 19 | ||||
| -rw-r--r-- | test/Sema/PR2963-enum-constant.c | 2 |
2 files changed, 13 insertions, 8 deletions
diff --git a/lib/Sema/SemaExpr.cpp b/lib/Sema/SemaExpr.cpp index e7d5ee18ff..6e86e71bd4 100644 --- a/lib/Sema/SemaExpr.cpp +++ b/lib/Sema/SemaExpr.cpp @@ -4929,6 +4929,13 @@ bool Sema::DiagnoseAssignmentResult(AssignConvertType ConvTy, } bool Sema::VerifyIntegerConstantExpression(const Expr *E, llvm::APSInt *Result){ + llvm::APSInt ICEResult; + if (E->isIntegerConstantExpr(ICEResult, Context)) { + if (Result) + *Result = ICEResult; + return false; + } + Expr::EvalResult EvalResult; if (!E->Evaluate(EvalResult, Context) || !EvalResult.Val.isInt() || @@ -4946,14 +4953,12 @@ bool Sema::VerifyIntegerConstantExpression(const Expr *E, llvm::APSInt *Result){ return true; } - if (EvalResult.Diag) { - Diag(E->getExprLoc(), diag::ext_expr_not_ice) << - E->getSourceRange(); + Diag(E->getExprLoc(), diag::ext_expr_not_ice) << + E->getSourceRange(); - // Print the reason it's not a constant. - if (Diags.getDiagnosticLevel(diag::ext_expr_not_ice) != Diagnostic::Ignored) - Diag(EvalResult.DiagLoc, EvalResult.Diag); - } + if (EvalResult.Diag && + Diags.getDiagnosticLevel(diag::ext_expr_not_ice) != Diagnostic::Ignored) + Diag(EvalResult.DiagLoc, EvalResult.Diag); if (Result) *Result = EvalResult.Val.getInt(); diff --git a/test/Sema/PR2963-enum-constant.c b/test/Sema/PR2963-enum-constant.c index 7a08814815..78f2326dae 100644 --- a/test/Sema/PR2963-enum-constant.c +++ b/test/Sema/PR2963-enum-constant.c @@ -13,5 +13,5 @@ enum enum { - SOME_VALUE= FLOAT_TO_SHORT_FIXED(0.1) + SOME_VALUE= FLOAT_TO_SHORT_FIXED(0.1) // expected-warning{{expression is not integer constant expression}} }; |