diff options
| author | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-09 04:17:57 +0000 |
|---|---|---|
| committer | Richard Smith <richard-llvm@metafoo.co.uk> | 2012-12-09 04:17:57 +0000 |
| commit | 569cdc82c1a99fe1e950a1ddbe5ff82df0b13f3d (patch) | |
| tree | e9f87abe28a00e37652bed3ff2a356dbfd07f112 | |
| parent | 0f584640dce8f9d10e802b1e323a594f7850a465 (diff) | |
PR14549. Don't assert if we see an incomplete decltype specifier at the end of the file.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@169688 91177308-0d34-0410-b5e6-96231b3b80d8
| -rw-r--r-- | lib/Parse/ParseDeclCXX.cpp | 3 | ||||
| -rw-r--r-- | test/Parser/bracket-crash.cpp | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/lib/Parse/ParseDeclCXX.cpp b/lib/Parse/ParseDeclCXX.cpp index 503d436c3b..2e7592f4dd 100644 --- a/lib/Parse/ParseDeclCXX.cpp +++ b/lib/Parse/ParseDeclCXX.cpp @@ -707,8 +707,7 @@ SourceLocation Parser::ParseDecltypeSpecifier(DeclSpec &DS) { if (SkipUntil(tok::r_paren, /*StopAtSemi=*/true, /*DontConsume=*/true)) { EndLoc = ConsumeParen(); } else { - assert(Tok.is(tok::semi)); - if (PP.isBacktrackEnabled()) { + if (PP.isBacktrackEnabled() && Tok.is(tok::semi)) { // Backtrack to get the location of the last token before the semi. PP.RevertCachedTokens(2); ConsumeToken(); // the semi. diff --git a/test/Parser/bracket-crash.cpp b/test/Parser/bracket-crash.cpp index bcc6eabc6e..93b5294077 100644 --- a/test/Parser/bracket-crash.cpp +++ b/test/Parser/bracket-crash.cpp @@ -4,3 +4,6 @@ decltype(; struct{ a } + +// PR14549. Must be at end of file. +decltype( |