[cfe-commits] r108119 - in /cfe/trunk: lib/Parse/Parser.cpp test/Parser/bracket-crash.cpp

[Chris Lattner]

Author: lattner
Date: Sun Jul 11 20:48:28 2010
New Revision: 108119

URL: http://llvm.org/viewvc/llvm-project?rev=108119&view=rev
Log:
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.

Added:
    cfe/trunk/test/Parser/bracket-crash.cpp
Modified:
    cfe/trunk/lib/Parse/Parser.cpp

Modified: cfe/trunk/lib/Parse/Parser.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/Parser.cpp?rev=108119&r1=108118&r2=108119&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/Parser.cpp (original)
+++ cfe/trunk/lib/Parse/Parser.cpp Sun Jul 11 20:48:28 2010
@@ -127,16 +127,7 @@
   }
   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;
 }
 

Added: cfe/trunk/test/Parser/bracket-crash.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Parser/bracket-crash.cpp?rev=108119&view=auto
==============================================================================
--- cfe/trunk/test/Parser/bracket-crash.cpp (added)
+++ cfe/trunk/test/Parser/bracket-crash.cpp Sun Jul 11 20:48:28 2010
@@ -0,0 +1,6 @@
+// RUN: not %clang_cc1 -fsyntax-only %s
+// PR7481
+struct{
+  a
+}
+