diff options
| author | Sebastian Redl <sebastian.redl@getdesigned.at> | 2009-02-07 13:06:23 +0000 |
|---|---|---|
| committer | Sebastian Redl <sebastian.redl@getdesigned.at> | 2009-02-07 13:06:23 +0000 |
| commit | f3b5e27feec3161ef1a0d73bec83dd74d3ccc86f (patch) | |
| tree | c7074ff7853c57d13232abeb6a1b33e5fef67491 /clang/lib/AST/Expr.cpp | |
| parent | 1d91dd98ad68f98c5d0b79c41d3a9ffc590e35b7 (diff) | |
| download | bcm5719-llvm-f3b5e27feec3161ef1a0d73bec83dd74d3ccc86f.tar.gz bcm5719-llvm-f3b5e27feec3161ef1a0d73bec83dd74d3ccc86f.zip | |
Make const-initialized const integral variables I-C-Es in C++.
llvm-svn: 64015
Diffstat (limited to 'clang/lib/AST/Expr.cpp')
| -rw-r--r-- | clang/lib/AST/Expr.cpp | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/clang/lib/AST/Expr.cpp b/clang/lib/AST/Expr.cpp index d686167cd0b..904fe5f99c3 100644 --- a/clang/lib/AST/Expr.cpp +++ b/clang/lib/AST/Expr.cpp @@ -865,6 +865,17 @@ bool Expr::isIntegerConstantExpr(llvm::APSInt &Result, ASTContext &Ctx, Result = D->getInitVal(); break; } + if (Ctx.getLangOptions().CPlusPlus && + getType().getCVRQualifiers() == QualType::Const) { + // C++ 7.1.5.1p2 + // A variable of non-volatile const-qualified integral or enumeration + // type initialized by an ICE can be used in ICEs. + if (const VarDecl *Dcl = + dyn_cast<VarDecl>(cast<DeclRefExpr>(this)->getDecl())) { + if (const Expr *Init = Dcl->getInit()) + return Init->isIntegerConstantExpr(Result, Ctx, Loc, isEvaluated); + } + } if (Loc) *Loc = getLocStart(); return false; case UnaryOperatorClass: { |
