summaryrefslogtreecommitdiffstats
path: root/clang/lib/Sema/SemaDeclCXX.cpp
diff options
context:
space:
mode:
authorClement Courbet <courbet@google.com>2018-12-10 08:53:17 +0000
committerClement Courbet <courbet@google.com>2018-12-10 08:53:17 +0000
commitd872041f8f691069c207976f4c0680c37f89c531 (patch)
tree05bb2ce30d5800e9860d0ffa76334489ef5ffcd9 /clang/lib/Sema/SemaDeclCXX.cpp
parent057f7695de385511c042e14542e0d3414109b267 (diff)
downloadbcm5719-llvm-d872041f8f691069c207976f4c0680c37f89c531.tar.gz
bcm5719-llvm-d872041f8f691069c207976f4c0680c37f89c531.zip
Revert r348741 "[Sema] Further improvements to to static_assert diagnostics."
Seems to break build bots. llvm-svn: 348742
Diffstat (limited to 'clang/lib/Sema/SemaDeclCXX.cpp')
-rw-r--r--clang/lib/Sema/SemaDeclCXX.cpp3
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Sema/SemaDeclCXX.cpp b/clang/lib/Sema/SemaDeclCXX.cpp
index 831e74a2bf6..e408c043791 100644
--- a/clang/lib/Sema/SemaDeclCXX.cpp
+++ b/clang/lib/Sema/SemaDeclCXX.cpp
@@ -13878,7 +13878,8 @@ Decl *Sema::BuildStaticAssertDeclaration(SourceLocation StaticAssertLoc,
Expr *InnerCond = nullptr;
std::string InnerCondDescription;
std::tie(InnerCond, InnerCondDescription) =
- findFailedBooleanCondition(Converted.get());
+ findFailedBooleanCondition(Converted.get(),
+ /*AllowTopLevelCond=*/false);
if (InnerCond) {
Diag(StaticAssertLoc, diag::err_static_assert_requirement_failed)
<< InnerCondDescription << !AssertMessage
OpenPOWER on IntegriCloud