[cfe-commits] r101941 - in /cfe/trunk: lib/Parse/ParseObjc.cpp test/SemaObjC/invalid-code.m

[Ted Kremenek]

Author: kremenek
Date: Tue Apr 20 16:21:51 2010
New Revision: 101941

URL: http://llvm.org/viewvc/llvm-project?rev=101941&view=rev
Log:
Fix crash on invalid code where a @throw statement is not followed by a ';'

Modified:
    cfe/trunk/lib/Parse/ParseObjc.cpp
    cfe/trunk/test/SemaObjC/invalid-code.m

Modified: cfe/trunk/lib/Parse/ParseObjc.cpp
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/lib/Parse/ParseObjc.cpp?rev=101941&r1=101940&r2=101941&view=diff
==============================================================================
--- cfe/trunk/lib/Parse/ParseObjc.cpp (original)
+++ cfe/trunk/lib/Parse/ParseObjc.cpp Tue Apr 20 16:21:51 2010
@@ -1448,7 +1448,8 @@
       return StmtError();
     }
   }
-  ConsumeToken(); // consume ';'
+  // consume ';'
+  ExpectAndConsume(tok::semi, diag::err_expected_semi_after, "@throw");
   return Actions.ActOnObjCAtThrowStmt(atLoc, move(Res), CurScope);
 }
 

Modified: cfe/trunk/test/SemaObjC/invalid-code.m
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/SemaObjC/invalid-code.m?rev=101941&r1=101940&r2=101941&view=diff
==============================================================================
--- cfe/trunk/test/SemaObjC/invalid-code.m (original)
+++ cfe/trunk/test/SemaObjC/invalid-code.m Tue Apr 20 16:21:51 2010
@@ -12,3 +12,10 @@
   __PRETTY_FUNCTION__; // expected-warning{{expression result unused}}
 }
 @end
+
+// <rdar://problem/7881045>
+// This previously triggered a crash because a ';' was expected after the @throw statement.
+void foo() {
+  @throw (id)0 // expected-error{{expected ';' after @throw}}
+}
+