diff options
| author | Bill Wendling <isanbard@gmail.com> | 2018-11-20 23:24:16 +0000 |
|---|---|---|
| committer | Bill Wendling <isanbard@gmail.com> | 2018-11-20 23:24:16 +0000 |
| commit | 91549ed15f97f21de8770196e66da3d228820cdc (patch) | |
| tree | a4a3c5ffe121d9c0fdcce151e96eba612d3c7ded /clang/lib/Sema/SemaDeclCXX.cpp | |
| parent | 8eb65cb25e67a2b426b94152f9c9bb3c1025b701 (diff) | |
| download | bcm5719-llvm-91549ed15f97f21de8770196e66da3d228820cdc.tar.gz bcm5719-llvm-91549ed15f97f21de8770196e66da3d228820cdc.zip | |
Reinstate 347294 with a fix for the failures.
EvaluateAsInt() is sometimes called in a constant context. When that's the
case, we need to specify it as so.
llvm-svn: 347364
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
| -rw-r--r-- | clang/lib/Sema/SemaDeclCXX.cpp | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp index 61ef7cb9373..8a716ed4cca 100644 --- a/clang/lib/Sema/SemaDeclCXX.cpp +++ b/clang/lib/Sema/SemaDeclCXX.cpp @@ -13860,6 +13860,8 @@ Decl *Sema::BuildStaticAssertDeclaration(SourceLocation StaticAssertLoc, ExprResult Converted = PerformContextuallyConvertToBool(AssertExpr); if (Converted.isInvalid()) Failed = true; + else + Converted = ConstantExpr::Create(Context, Converted.get()); llvm::APSInt Cond; if (!Failed && VerifyIntegerConstantExpression(Converted.get(), &Cond, |
