diff options
| author | Nico Weber <thakis@chromium.org> | 2021-01-27 16:51:27 -0500 |
|---|---|---|
| committer | Nico Weber <thakis@chromium.org> | 2021-01-27 18:15:25 -0500 |
| commit | 764a7a2155c6747ec8d0b38d8edbb65960eae874 (patch) | |
| tree | 92301420d093cd04dae6c3b5cfa1717bd04c696a /clang/lib/Parse/ParseDecl.cpp | |
| parent | 7e88942d2548704b35ac92bd327b38f9c6a991d2 (diff) | |
| download | llvm-764a7a2155c6747ec8d0b38d8edbb65960eae874.zip llvm-764a7a2155c6747ec8d0b38d8edbb65960eae874.tar.gz llvm-764a7a2155c6747ec8d0b38d8edbb65960eae874.tar.bz2 | |
clang: Fix static_assert in a few contexts in microsoft mode
Follow-up to D17444. Fixes PR48904. See bug for details.
Differential Revision: https://reviews.llvm.org/D95559
Diffstat (limited to 'clang/lib/Parse/ParseDecl.cpp')
| -rw-r--r-- | clang/lib/Parse/ParseDecl.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/clang/lib/Parse/ParseDecl.cpp b/clang/lib/Parse/ParseDecl.cpp index 6a0ba51..55a0c6a 100644 --- a/clang/lib/Parse/ParseDecl.cpp +++ b/clang/lib/Parse/ParseDecl.cpp @@ -4231,7 +4231,7 @@ void Parser::ParseStructUnionBody(SourceLocation RecordLoc, } // Parse _Static_assert declaration. - if (Tok.is(tok::kw__Static_assert)) { + if (Tok.isOneOf(tok::kw__Static_assert, tok::kw_static_assert)) { SourceLocation DeclEnd; ParseStaticAssertDeclaration(DeclEnd); continue; @@ -5191,6 +5191,7 @@ bool Parser::isDeclarationSpecifier(bool DisambiguatingWithExpression) { case tok::kw_friend: // static_assert-declaration + case tok::kw_static_assert: case tok::kw__Static_assert: // GNU typeof support. |