commit f4f2ff773be2a11d976b5c7a1f6a15b978c1ff01
author Douglas Gregor <dgregor@apple.com> Fri Nov 06 05:48:00 2009 +0000
committer Douglas Gregor <dgregor@apple.com> Fri Nov 06 05:48:00 2009 +0000
tree 828ef6817de172a74df590a18662e943997e3334
parent 6af6c3ee565e854e89be248682490ea9d6b10ca7

Improve recovery when we fail to parse the operand of a C++ named cast. Fixes PR5210

llvm-svn: 86234

clang/lib/Parse/ParseExprCXX.cpp

diff --git a/clang/lib/Parse/ParseExprCXX.cpp b/clang/lib/Parse/ParseExprCXX.cpp
index a00dfb0..fa8e64d 100644
--- a/clang/lib/Parse/ParseExprCXX.cpp
+++ b/clang/lib/Parse/ParseExprCXX.cpp
@@ -381,13 +381,7 @@
   OwningExprResult Result = ParseExpression();
 
   // Match the ')'.
-  if (Result.isInvalid())
-    SkipUntil(tok::r_paren);
-
-  if (Tok.is(tok::r_paren))
-    RParenLoc = ConsumeParen();
-  else
-    MatchRHSPunctuation(tok::r_paren, LParenLoc);
+  RParenLoc = MatchRHSPunctuation(tok::r_paren, LParenLoc);
 
   if (!Result.isInvalid() && !CastTy.isInvalid())
     Result = Actions.ActOnCXXNamedCast(OpLoc, Kind,