Objective-C keywords are not always identifiers. Some are also C++ keywords

git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@60373 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/lib/Lex/Lexer.cpp b/lib/Lex/Lexer.cpp
index d72c319d97c8309f93ab5da9b16e0812843de475..f85cfd9f0f076adc466c2ff5d16aacef74330e39 100644 (file)
--- a/lib/Lex/Lexer.cpp
+++ b/lib/Lex/Lexer.cpp
@@ -41,8 +41,9 @@ static void InitCharacterInfo();
 
 /// isObjCAtKeyword - Return true if we have an ObjC keyword identifier. 
 bool Token::isObjCAtKeyword(tok::ObjCKeywordKind objcKey) const {
-  return is(tok::identifier) && 
-         getIdentifierInfo()->getObjCKeywordID() == objcKey;
+  if (IdentifierInfo *II = getIdentifierInfo())
+    return II->getObjCKeywordID() == objcKey;
+  return false;
 }
 
 /// getObjCKeywordID - Return the ObjC keyword kind.

diff --git a/test/Parser/objc-try-catch-1.m b/test/Parser/objc-try-catch-1.m
index 072c4609eb2aa73a3590d269af37934400637c64..d8264fabbe36142b91ee5b0ee37059ad1f6d285d 100644 (file)
--- a/test/Parser/objc-try-catch-1.m
+++ b/test/Parser/objc-try-catch-1.m
@@ -1,5 +1,5 @@
-// RUN: clang -fsyntax-only -verify %s
-
+// RUN: clang -fsyntax-only -verify %s &&
+// RUN: clang -fsyntax-only -verify -x objective-c++ %s
 void * proc();
 
 @interface NSConstantString