[llvm-branch-commits] [cfe-branch] r169722 - in /cfe/branches/release_32: ./ lib/Parse/ParseDeclCXX.cpp test/Parser/bracket-crash.cpp
Pawel Wodnicki
pawel at 32bitmicro.com
Sun Dec 9 19:31:55 PST 2012
Author: pawel
Date: Sun Dec 9 21:31:55 2012
New Revision: 169722
URL: http://llvm.org/viewvc/llvm-project?rev=169722&view=rev
Log:
Merging r169688: into 3.2 release branch.
PR14549. Don't assert if we see an incomplete decltype specifier at the end of the file.
Modified:
cfe/branches/release_32/ (props changed)
cfe/branches/release_32/lib/Parse/ParseDeclCXX.cpp
cfe/branches/release_32/test/Parser/bracket-crash.cpp
Propchange: cfe/branches/release_32/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Sun Dec 9 21:31:55 2012
@@ -1,3 +1,3 @@
/cfe/branches/type-system-rewrite:134693-134817
-/cfe/trunk:167749,167762,167766,167780,167788,167790,167813-167814,167868,167884,167918,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674,168818,169084
+/cfe/trunk:167749,167762,167766,167780,167788,167790,167813-167814,167868,167884,167918,167920,167925,167935,168024,168063,168124,168269,168277-168278,168297,168303,168355,168379,168674,168818,169084,169688
/cfe/trunk/test/SemaTemplate:126920
Modified: cfe/branches/release_32/lib/Parse/ParseDeclCXX.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/lib/Parse/ParseDeclCXX.cpp?rev=169722&r1=169721&r2=169722&view=diff
==============================================================================
--- cfe/branches/release_32/lib/Parse/ParseDeclCXX.cpp (original)
+++ cfe/branches/release_32/lib/Parse/ParseDeclCXX.cpp Sun Dec 9 21:31:55 2012
@@ -706,8 +706,7 @@
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.
Modified: cfe/branches/release_32/test/Parser/bracket-crash.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/branches/release_32/test/Parser/bracket-crash.cpp?rev=169722&r1=169721&r2=169722&view=diff
==============================================================================
--- cfe/branches/release_32/test/Parser/bracket-crash.cpp (original)
+++ cfe/branches/release_32/test/Parser/bracket-crash.cpp Sun Dec 9 21:31:55 2012
@@ -4,3 +4,6 @@
struct{
a
}
+
+// PR14549. Must be at end of file.
+decltype(
More information about the llvm-branch-commits
mailing list