diff options
| -rw-r--r-- | lib/Parse/ParseObjc.cpp | 3 | ||||
| -rw-r--r-- | test/SemaObjC/invalid-code.m | 7 |
2 files changed, 9 insertions, 1 deletions
diff --git a/lib/Parse/ParseObjc.cpp b/lib/Parse/ParseObjc.cpp index 928ffb8afa..057907d112 100644 --- a/lib/Parse/ParseObjc.cpp +++ b/lib/Parse/ParseObjc.cpp @@ -1448,7 +1448,8 @@ Parser::OwningStmtResult Parser::ParseObjCThrowStmt(SourceLocation atLoc) { return StmtError(); } } - ConsumeToken(); // consume ';' + // consume ';' + ExpectAndConsume(tok::semi, diag::err_expected_semi_after, "@throw"); return Actions.ActOnObjCAtThrowStmt(atLoc, move(Res), CurScope); } diff --git a/test/SemaObjC/invalid-code.m b/test/SemaObjC/invalid-code.m index 2f297cf6e6..7a642fb107 100644 --- a/test/SemaObjC/invalid-code.m +++ b/test/SemaObjC/invalid-code.m @@ -12,3 +12,10 @@ void test1() { __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}} +} + |