Remove old implementation, go back to checking only when enabled

Author: AaronBallman

clang/include/clang/Basic/IdentifierTable.h

@@ -444,18 +444,13 @@ class alignas(IdentifierInfoAlignment) IdentifierInfo {
   }
   bool isCPlusPlusOperatorKeyword() const { return IsCPPOperatorKeyword; }
 
-  /// Return true if this identifier uses a keyword token and is a keyword in
-  /// the specified language.
+  /// Return true if this token is a keyword in the specified language.
   bool isKeyword(const LangOptions &LangOpts) const;
 
-  /// Return true if this identifier uses a keyword token and is a C++ keyword
-  /// in the specified language.
+  /// Return true if this token is a C++ keyword in the specified
+  /// language.
   bool isCPlusPlusKeyword(const LangOptions &LangOpts) const;
 
-  /// Returns true if the name of this identifier matches a keyword given the
-  /// specified language options.
-  bool isNameKeyword(const LangOptions &LangOpts) const;
-
   /// Get and set FETokenInfo. The language front-end is allowed to associate
   /// arbitrary metadata with this token.
   void *getFETokenInfo() const { return FETokenInfo; }

clang/lib/Basic/IdentifierTable.cpp

@@ -343,15 +343,6 @@ static KeywordStatus getTokenKwStatus(const LangOptions &LangOpts,
   }
 }
 
-static KeywordStatus getNameKwStatus(const LangOptions &LangOpts,
-                                     StringRef Name) {
-  return llvm::StringSwitch<KeywordStatus>(Name)
-#define KEYWORD(NAME, FLAGS) .Case(#NAME, getKeywordStatus(LangOpts, FLAGS))
-#define CXX_KEYWORD_OPERATOR(NAME, TOK) .Case(#NAME, KS_Enabled)
-#include "clang/Basic/TokenKinds.def"
-      .Default(KS_Disabled);
-}
-
 /// Returns true if the identifier represents a keyword in the
 /// specified language.
 bool IdentifierInfo::isKeyword(const LangOptions &LangOpts) const {
@@ -364,21 +355,6 @@ bool IdentifierInfo::isKeyword(const LangOptions &LangOpts) const {
   }
 }
 
-bool IdentifierInfo::isNameKeyword(const LangOptions &LangOpts) const {
-  // This differs from IdentifierInfo::isCPlusPlusKeyword(). That function
-  // tests if the identifier is a keyword token in C++ mode and then isn't a
-  // keyword token in C modes. In our case, if it was a keyword, we wouldn't
-  // have gotten the identifier for it anyway, so that function will always
-  // return false for us. Instead, check against the identifier name directly.
-  switch (getNameKwStatus(LangOpts, getName())) {
-  case KS_Enabled:
-  case KS_Extension:
-    return true;
-  default:
-    return false;
-  }
-}
-
 /// Returns true if the identifier represents a C++ keyword in the
 /// specified language.
 bool IdentifierInfo::isCPlusPlusKeyword(const LangOptions &LangOpts) const {

clang/lib/Sema/SemaDecl.cpp

@@ -6145,9 +6145,8 @@ void Sema::warnOnReservedIdentifier(const NamedDecl *D) {
   }
   // Diagnose use of C++ keywords in C as being incompatible with C++.
   if (!getLangOpts().CPlusPlus &&
-/*      !Diags.isIgnored(diag::warn_identifier_is_cpp_keyword,
+      !Diags.isIgnored(diag::warn_identifier_is_cpp_keyword,
                        D->getLocation()) &&
-*/
       isKeywordInCPlusPlus(*this, D->getIdentifier()))
     Diag(D->getLocation(), diag::warn_identifier_is_cpp_keyword) << D;
 }