Some small tweaks to the recent Objc support...
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@41803 91177308-0d34-0410-b5e6-96231b3b80d8
diff --git a/Parse/Parser.cpp b/Parse/Parser.cpp
index 9743da7..da1bb52 100644
--- a/Parse/Parser.cpp
+++ b/Parse/Parser.cpp
@@ -343,8 +343,7 @@
return 0;
case tok::at:
// @ is not a legal token unless objc is enabled, no need to check.
- ParseObjCAtDirectives();
- return 0;
+ return ParseObjCAtDirectives();
case tok::minus:
if (getLang().ObjC1) {
ParseObjCInstanceMethodDefinition();
@@ -549,6 +548,7 @@
// Ask the actions module to compute the type for this declarator.
Action::TypeResult TR =
Actions.ParseParamDeclaratorType(CurScope, ParmDeclarator);
+
if (!TR.isInvalid &&
// A missing identifier has already been diagnosed.
ParmDeclarator.getIdentifier()) {