diff options
author | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-01-07 19:42:26 +0000 |
---|---|---|
committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2017-01-07 19:42:26 +0000 |
commit | 917316fc5d910f9af26e592eef69f6d79397ba6d (patch) | |
tree | 60bfe43a7e8a1fca4cfdad2757325ff1ed835014 /clang/lib/Parse/ParseDecl.cpp | |
parent | fe4e7d0c94efef838d26e907411058dee1abc72b (diff) | |
download | bcm5719-llvm-917316fc5d910f9af26e592eef69f6d79397ba6d.tar.gz bcm5719-llvm-917316fc5d910f9af26e592eef69f6d79397ba6d.zip |
Consistently use a ConstantEvaluated context for expressions in attributes,
except for those with the "attributes are unevaluated contexts" flag.
llvm-svn: 291358
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
-rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index ba24adefe6b..833d93e4548 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -306,10 +306,11 @@ unsigned Parser::ParseAttributeArgsCommon( // Parse the non-empty comma-separated list of expressions. do { - bool ShouldEnter = attributeParsedArgsUnevaluated(*AttrName); + bool Uneval = attributeParsedArgsUnevaluated(*AttrName); EnterExpressionEvaluationContext Unevaluated( - Actions, Sema::Unevaluated, /*LambdaContextDecl=*/nullptr, - /*IsDecltype=*/false, ShouldEnter); + Actions, Uneval ? Sema::Unevaluated : Sema::ConstantEvaluated, + /*LambdaContextDecl=*/nullptr, + /*IsDecltype=*/false); ExprResult ArgExpr( Actions.CorrectDelayedTyposInExpr(ParseAssignmentExpression())); |