summaryrefslogtreecommitdiffstats
path: root/clang/lib/Parse/Parser.cpp
diff options
context:
space:
mode:
authorDavid Majnemer <david.majnemer@gmail.com>2015-01-12 03:14:18 +0000
committerDavid Majnemer <david.majnemer@gmail.com>2015-01-12 03:14:18 +0000
commita3aef35d54318ba6d13fa1336bd8d0e97c5bc6a3 (patch)
tree1c8faa6d46fde81bd8f679056b661a7973f61bd4 /clang/lib/Parse/Parser.cpp
parent3661a82ef683aeda82f441627fed2895804bcc0c (diff)
downloadbcm5719-llvm-a3aef35d54318ba6d13fa1336bd8d0e97c5bc6a3.tar.gz
bcm5719-llvm-a3aef35d54318ba6d13fa1336bd8d0e97c5bc6a3.zip
Parse: Don't let BalancedDelimiterTracker consume cxx_defaultarg_end
It is not correct to let it consume the cxx_defaultarg_end token. I'm starting to wonder if it makes more sense to stop SkipUntil from consuming such tokens. llvm-svn: 225615
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r--clang/lib/Parse/Parser.cpp2
1 files changed, 1 insertions, 1 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp
index 7ccd2092a2d..c9243d64880 100644
--- a/clang/lib/Parse/Parser.cpp
+++ b/clang/lib/Parse/Parser.cpp
@@ -1948,7 +1948,7 @@ bool BalancedDelimiterTracker::diagnoseMissingClose() {
// token.
if (P.Tok.isNot(tok::r_paren) && P.Tok.isNot(tok::r_brace) &&
P.Tok.isNot(tok::r_square) &&
- P.SkipUntil(Close, FinalToken,
+ P.SkipUntil(Close, FinalToken, tok::cxx_defaultarg_end,
Parser::StopAtSemi | Parser::StopBeforeMatch) &&
P.Tok.is(Close))
LClose = P.ConsumeAnyToken();
OpenPOWER on IntegriCloud