diff options
author | Chris Lattner <sabre@nondot.org> | 2010-07-12 01:48:28 +0000 |
---|---|---|
committer | Chris Lattner <sabre@nondot.org> | 2010-07-12 01:48:28 +0000 |
commit | 0931644922859412cbb19b2899d7cc5578789c6b (patch) | |
tree | f1699bf4bfbbde3c9c29167d5c4ae7193238bb62 /clang/lib/Parse/Parser.cpp | |
parent | 01c5a15dde7660aa0d7c3a94bd724c897e4e3d89 (diff) | |
download | bcm5719-llvm-0931644922859412cbb19b2899d7cc5578789c6b.tar.gz bcm5719-llvm-0931644922859412cbb19b2899d7cc5578789c6b.zip |
revert a hunk of code that Argiris added in r106213, which is the
root cause of PR7481 and probably more, and has no apparent
testcases. I don't understand the logic here so I can't repair it.
llvm-svn: 108119
Diffstat (limited to 'clang/lib/Parse/Parser.cpp')
-rw-r--r-- | clang/lib/Parse/Parser.cpp | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/clang/lib/Parse/Parser.cpp b/clang/lib/Parse/Parser.cpp index def2ca4088b..02fac169052 100644 --- a/clang/lib/Parse/Parser.cpp +++ b/clang/lib/Parse/Parser.cpp @@ -127,16 +127,7 @@ SourceLocation Parser::MatchRHSPunctuation(tok::TokenKind RHSTok, } Diag(Tok, DID); Diag(LHSLoc, diag::note_matching) << LHSName; - if (!SkipUntil(RHSTok)) { - // We stopped before finding a RHS token, e.g. we encountered a ';'. - // Balance Paren/Brace/Bracket counting. - switch (RHSTok) { - default: break; - case tok::r_paren : assert(ParenCount > 0); --ParenCount; break; - case tok::r_brace : assert(BraceCount > 0); --BraceCount; break; - case tok::r_square: assert(BracketCount > 0); --BracketCount; break; - } - } + SkipUntil(RHSTok); return R; } |