commit f79bd5cb9db30abc7a153d14297b4c8bf46f6f86
author Serge Pavlov <sepavloff@gmail.com> Wed Dec 04 03:51:59 2013 +0000
committer Serge Pavlov <sepavloff@gmail.com> Wed Dec 04 03:51:59 2013 +0000
tree 90a543288f72dc8548831e2b74852ceca2cd24ee
parent cb7e5df97efa0d5cbe6e51902cd619bec1516f16

Fix error recovery in return statement.

This patch fixes PR16989.

llvm-svn: 196352

clang/lib/Parse/ParseStmt.cpp

diff --git a/clang/lib/Parse/ParseStmt.cpp b/clang/lib/Parse/ParseStmt.cpp
index 35c7188..8026f78 100644
--- a/clang/lib/Parse/ParseStmt.cpp
+++ b/clang/lib/Parse/ParseStmt.cpp
@@ -1730,8 +1730,8 @@
           << R.get()->getSourceRange();
     } else
         R = ParseExpression();
-    if (R.isInvalid()) {  // Skip to the semicolon, but don't consume it.
-      SkipUntil(tok::semi, StopBeforeMatch);
+    if (R.isInvalid()) {
+      SkipUntil(tok::r_brace, StopAtSemi | StopBeforeMatch);
       return StmtError();
     }
   }