diff options
| author | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-30 20:31:30 +0000 |
|---|---|---|
| committer | Erik Pilkington <erik.pilkington@gmail.com> | 2018-10-30 20:31:30 +0000 |
| commit | fa98390b3c3144c7cd446621526ca04c075435d8 (patch) | |
| tree | f9c611a2729575b3822b5c0721b4a56f673c4ec2 /clang/lib/Basic/IdentifierTable.cpp | |
| parent | fe09a20f09a290274ea81d1703d4106e06a11f94 (diff) | |
| download | bcm5719-llvm-fa98390b3c3144c7cd446621526ca04c075435d8.tar.gz bcm5719-llvm-fa98390b3c3144c7cd446621526ca04c075435d8.zip | |
NFC: Remove the ObjC1/ObjC2 distinction from clang (and related projects)
We haven't supported compiling ObjC1 for a long time (and never will again), so
there isn't any reason to keep these separate. This patch replaces
LangOpts::ObjC1 and LangOpts::ObjC2 with LangOpts::ObjC.
Differential revision: https://reviews.llvm.org/D53547
llvm-svn: 345637
Diffstat (limited to 'clang/lib/Basic/IdentifierTable.cpp')
| -rw-r--r-- | clang/lib/Basic/IdentifierTable.cpp | 13 |
1 files changed, 5 insertions, 8 deletions
diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp index 00fd1838b7c..d42b80f9e71 100644 --- a/clang/lib/Basic/IdentifierTable.cpp +++ b/clang/lib/Basic/IdentifierTable.cpp @@ -117,7 +117,7 @@ namespace { HALFSUPPORT = 0x08000, CHAR8SUPPORT = 0x10000, KEYCONCEPTS = 0x20000, - KEYOBJC2 = 0x40000, + KEYOBJC = 0x40000, KEYZVECTOR = 0x80000, KEYCOROUTINES = 0x100000, KEYMODULES = 0x200000, @@ -163,8 +163,8 @@ static KeywordStatus getKeywordStatus(const LangOptions &LangOpts, if (LangOpts.C11 && (Flags & KEYC11)) return KS_Enabled; // We treat bridge casts as objective-C keywords so we can warn on them // in non-arc mode. - if (LangOpts.ObjC2 && (Flags & KEYARC)) return KS_Enabled; - if (LangOpts.ObjC2 && (Flags & KEYOBJC2)) return KS_Enabled; + if (LangOpts.ObjC && (Flags & KEYARC)) return KS_Enabled; + if (LangOpts.ObjC && (Flags & KEYOBJC)) return KS_Enabled; if (LangOpts.ConceptsTS && (Flags & KEYCONCEPTS)) return KS_Enabled; if (LangOpts.CoroutinesTS && (Flags & KEYCOROUTINES)) return KS_Enabled; if (LangOpts.ModulesTS && (Flags & KEYMODULES)) return KS_Enabled; @@ -228,11 +228,8 @@ void IdentifierTable::AddKeywords(const LangOptions &LangOpts) { #define CXX_KEYWORD_OPERATOR(NAME, ALIAS) \ if (LangOpts.CXXOperatorNames) \ AddCXXOperatorKeyword(StringRef(#NAME), tok::ALIAS, *this); -#define OBJC1_AT_KEYWORD(NAME) \ - if (LangOpts.ObjC1) \ - AddObjCKeyword(StringRef(#NAME), tok::objc_##NAME, *this); -#define OBJC2_AT_KEYWORD(NAME) \ - if (LangOpts.ObjC2) \ +#define OBJC_AT_KEYWORD(NAME) \ + if (LangOpts.ObjC) \ AddObjCKeyword(StringRef(#NAME), tok::objc_##NAME, *this); #define TESTING_KEYWORD(NAME, FLAGS) #include "clang/Basic/TokenKinds.def" |
