From c88e40450d38533980387c8ed0c9ecd9b7e287c4 Mon Sep 17 00:00:00 2001 From: Richard Smith Date: Sun, 9 Dec 2012 04:17:57 +0000 Subject: [PATCH] PR14549. Don't assert if we see an incomplete decltype specifier at the end of the file. llvm-svn: 169688 --- clang/lib/Parse/ParseDeclCXX.cpp | 3 +-- clang/test/Parser/bracket-crash.cpp | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/clang/lib/Parse/ParseDeclCXX.cpp b/clang/lib/Parse/ParseDeclCXX.cpp index 503d436..2e7592f 100644 --- a/clang/lib/Parse/ParseDeclCXX.cpp +++ b/clang/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/clang/test/Parser/bracket-crash.cpp b/clang/test/Parser/bracket-crash.cpp index bcc6eab..93b5294 100644 --- a/clang/test/Parser/bracket-crash.cpp +++ b/clang/test/Parser/bracket-crash.cpp @@ -4,3 +4,6 @@ decltype(; struct{ a } + +// PR14549. Must be at end of file. +decltype( -- 2.7.4