2 files changed, 2 insertions, 96 deletions

diff --git a/clang/lib/Basic/IdentifierTable.cpp b/clang/lib/Basic/IdentifierTable.cpp
index 613b43fce95..dd097047dce 100644
--- a/clang/lib/Basic/IdentifierTable.cpp
+++ b/clang/lib/Basic/IdentifierTable.cpp
@@ -122,7 +122,7 @@ namespace {
 
 /// \brief Translates flags as specified in TokenKinds.def into keyword status
 /// in the given language standard.
-static KeywordStatus getKeywordStatus(const LangOptions &LangOpts,
+static KeywordStatus GetKeywordStatus(const LangOptions &LangOpts,
                                       unsigned Flags) {
   if (Flags == KEYALL) return KS_Enabled;
   if (LangOpts.CPlusPlus && (Flags & KEYCXX)) return KS_Enabled;
@@ -151,7 +151,7 @@ static KeywordStatus getKeywordStatus(const LangOptions &LangOpts,
 static void AddKeyword(StringRef Keyword,
                        tok::TokenKind TokenCode, unsigned Flags,
                        const LangOptions &LangOpts, IdentifierTable &Table) {
-  KeywordStatus AddResult = getKeywordStatus(LangOpts, Flags);
+  KeywordStatus AddResult = GetKeywordStatus(LangOpts, Flags);
 
   // Don't add this keyword under MSVCCompat.
   if (LangOpts.MSVCCompat && (Flags & KEYNOMS))
@@ -209,31 +209,6 @@ void IdentifierTable::AddKeywords(const LangOptions &LangOpts) {
                LangOpts, *this);
 }
 
-/// \brief Checks if the specified token kind represents a keyword in the
-/// specified language.
-/// \returns Status of the keyword in the language.
-static KeywordStatus getTokenKwStatus(const LangOptions &LangOpts,
-                                      tok::TokenKind K) {
-  switch (K) {
-#define KEYWORD(NAME, FLAGS) \
-  case tok::kw_##NAME: return getKeywordStatus(LangOpts, FLAGS);
-#include "clang/Basic/TokenKinds.def"
-  default: return KS_Disabled;
-  }
-}
-
-/// \brief Returns true if the identifier represents a keyword in the
-/// specified language.
-bool IdentifierInfo::isKeyword(const LangOptions &LangOpts) {
-  switch (getTokenKwStatus(LangOpts, getTokenID())) {
-  case KS_Enabled:
-  case KS_Extension:
-    return true;
-  default:
-    return false;
-  }
-}
-
 tok::PPKeywordKind IdentifierInfo::getPPKeywordID() const {
   // We use a perfect hash function here involving the length of the keyword,
   // the first and third character.  For preprocessor ID's there are no
diff --git a/clang/lib/Lex/PPDirectives.cpp b/clang/lib/Lex/PPDirectives.cpp
index 16b86b7a305..0a46663d85d 100644
--- a/clang/lib/Lex/PPDirectives.cpp
+++ b/clang/lib/Lex/PPDirectives.cpp
@@ -100,58 +100,6 @@ void Preprocessor::DiscardUntilEndOfDirective() {
   } while (Tmp.isNot(tok::eod));
 }
 
-/// \brief Enumerates possible cases of #define/#undef a reserved identifier.
-enum MacroDiag {
-  MD_NoWarn,        //> Not a reserved identifier
-  MD_KeywordDef,    //> Macro hides keyword, enabled by default
-  MD_KeywordUndef,  //> #undef keyword, enabled by default
-  MD_WarnStrict     //> Other reserved id, disabled by default
-};
-
-/// \brief Checks if the specified identifier is reserved in the specified
-/// language.
-/// This function does not check if the identifier is a keyword.
-static bool isReservedId(StringRef Text, const LangOptions &Lang) {
-  // C++ [macro.names], C11 7.1.3:
-  // All identifiers that begin with an underscore and either an uppercase
-  // letter or another underscore are always reserved for any use.
-  if (Text.size() >= 2 && Text[0] == '_' &&
-      (isUppercase(Text[1]) || Text[1] == '_'))
-    return true;
-  // C++ [global.names]
-  // Each name that contains a double underscore ... is reserved to the
-  // implementation for any use.
-  if (Lang.CPlusPlus) {
-    if (Text.find("__") != StringRef::npos)
-      return true;
-  }
-  return false;
-}
-
-static MacroDiag shouldWarnOnMacroDef(Preprocessor &PP, IdentifierInfo *II) {
-  const LangOptions &Lang = PP.getLangOpts();
-  StringRef Text = II->getName();
-  if (isReservedId(Text, Lang))
-    return MD_WarnStrict;
-  if (II->isKeyword(Lang))
-    return MD_KeywordDef;
-  if (Lang.CPlusPlus && (Text.equals("override") || Text.equals("final")))
-    return MD_KeywordDef;
-  return MD_NoWarn;
-}
-
-static MacroDiag shouldWarnOnMacroUndef(Preprocessor &PP, IdentifierInfo *II) {
-  const LangOptions &Lang = PP.getLangOpts();
-  if (II->isKeyword(Lang))
-    return MD_KeywordUndef;
-  StringRef Text = II->getName();
-  if (Lang.CPlusPlus && (Text.equals("override") || Text.equals("final")))
-    return MD_KeywordUndef;
-  if (isReservedId(Text, Lang))
-    return MD_WarnStrict;
-  return MD_NoWarn;
-}
-
 bool Preprocessor::CheckMacroName(Token &MacroNameTok, MacroUse isDefineUndef) {
   // Missing macro name?
   if (MacroNameTok.is(tok::eod))
@@ -192,23 +140,6 @@ bool Preprocessor::CheckMacroName(Token &MacroNameTok, MacroUse isDefineUndef) {
     Diag(MacroNameTok, diag::ext_pp_undef_builtin_macro);
   }
 
-  // Warn if defining/undefining reserved identifier including keywords.
-  SourceLocation MacroNameLoc = MacroNameTok.getLocation();
-  if (!SourceMgr.isInSystemHeader(MacroNameLoc) &&
-      (strcmp(SourceMgr.getBufferName(MacroNameLoc), "<built-in>") != 0)) {
-    MacroDiag D = MD_NoWarn;
-    if (isDefineUndef == MU_Define)
-      D = shouldWarnOnMacroDef(*this, II);
-    else if (isDefineUndef == MU_Undef)
-      D = shouldWarnOnMacroUndef(*this, II);
-    if (D == MD_KeywordDef)
-      Diag(MacroNameTok, diag::warn_pp_macro_hides_keyword);
-    if (D == MD_KeywordUndef)
-      Diag(MacroNameTok, diag::warn_pp_macro_is_reserved_id);
-    else if (D == MD_WarnStrict)
-      Diag(MacroNameTok, diag::warn_pp_defundef_reserved_ident);
-  }
-
   // Okay, we got a good identifier.
   return false;
 }