From b2bc62bd35129f09d0746ef6a5ef4dc392b6d6e1 Mon Sep 17 00:00:00 2001 From: Sebastian Redl Date: Sun, 8 Feb 2009 15:51:17 +0000 Subject: [PATCH] Teach the constant evaluator about C++ const integral variables. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@64086 91177308-0d34-0410-b5e6-96231b3b80d8 --- lib/AST/ExprConstant.cpp | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/lib/AST/ExprConstant.cpp b/lib/AST/ExprConstant.cpp index 9798520507..c7cc85425c 100644 --- a/lib/AST/ExprConstant.cpp +++ b/lib/AST/ExprConstant.cpp @@ -574,7 +574,16 @@ bool IntExprEvaluator::VisitDeclRefExpr(const DeclRefExpr *E) { Result.setIsUnsigned(!E->getType()->isSignedIntegerType()); return true; } - + + // In C++, const, non-volatile integers initialized with ICEs are ICEs. + if (Info.Ctx.getLangOptions().CPlusPlus && + E->getType().getCVRQualifiers() == QualType::Const) { + if (const VarDecl *D = dyn_cast(E->getDecl())) { + if (const Expr *Init = D->getInit()) + return Visit(const_cast(Init)); + } + } + // Otherwise, random variable references are not constants. return Error(E->getLocStart(), diag::note_invalid_subexpr_in_ice, E); } -- 2.50.1