commit 5e774b1333e9a0f1168274fbf1c4851bfc0f210a
author Eli Friedman <eli.friedman@gmail.com> Sat Jun 27 20:38:33 2009 +0000
committer Eli Friedman <eli.friedman@gmail.com> Sat Jun 27 20:38:33 2009 +0000
tree c3bd0ca69b985c8dc77e97bd3b98ba4cd6876bf8
parent 0799d916e1da65d9eebd0e05859b62039ef97316

Fix the parser error hanlding for __builtin_offsetof to actually print 
out an error for a malformed __builtin_offsetof.

llvm-svn: 74388

clang/lib/Parse/ParseExpr.cpp

diff --git a/clang/lib/Parse/ParseExpr.cpp b/clang/lib/Parse/ParseExpr.cpp
index 13b32ac..ee2f209 100644
--- a/clang/lib/Parse/ParseExpr.cpp
+++ b/clang/lib/Parse/ParseExpr.cpp
@@ -1172,17 +1172,18 @@
 
         Comps.back().LocEnd =
           MatchRHSPunctuation(tok::r_square, Comps.back().LocStart);
-      } else if (Tok.is(tok::r_paren)) {
-        if (Ty.isInvalid())
+      } else {
+        if (Tok.isNot(tok::r_paren)) {
+          MatchRHSPunctuation(tok::r_paren, LParenLoc);
           Res = ExprError();
-        else
+        } else if (Ty.isInvalid()) {
+          Res = ExprError();
+        } else {
           Res = Actions.ActOnBuiltinOffsetOf(CurScope, StartLoc, TypeLoc, 
                                              Ty.get(), &Comps[0], 
                                              Comps.size(), ConsumeParen());
+        }
         break;
-      } else {
-        // Error occurred.
-        return ExprError();
       }
     }
     break;