2 files changed, 4 insertions, 21 deletions
diff --git a/include/clang/Serialization/ASTReader.h b/include/clang/Serialization/ASTReader.h
index 832ba7c0ec..246abcf6d7 100644
--- a/include/clang/Serialization/ASTReader.h
+++ b/include/clang/Serialization/ASTReader.h
@@ -458,13 +458,10 @@ private:
   public:
     enum NameKind {
       Declaration,
-      MacroVisibility,
-      MacroUndef
+      MacroVisibility
     } Kind;
 
   private:
-    unsigned Loc;
-
     union {
       Decl *D;
       MacroDirective *MD;
@@ -473,13 +470,10 @@ private:
     IdentifierInfo *Id;
 
   public:
-    HiddenName(Decl *D) : Kind(Declaration), Loc(), D(D), Id() { }
+    HiddenName(Decl *D) : Kind(Declaration), D(D), Id() { }
 
     HiddenName(IdentifierInfo *II, MacroDirective *MD)
-      : Kind(MacroVisibility), Loc(), MD(MD), Id(II) { }
-
-    HiddenName(IdentifierInfo *II, MacroDirective *MD, SourceLocation Loc)
-      : Kind(MacroUndef), Loc(Loc.getRawEncoding()), MD(MD), Id(II) { }
+      : Kind(MacroVisibility), MD(MD), Id(II) { }
 
     NameKind getKind() const { return Kind; }
 
@@ -489,15 +483,9 @@ private:
     }
 
     std::pair<IdentifierInfo *, MacroDirective *> getMacro() const {
-      assert((getKind() == MacroUndef || getKind() == MacroVisibility)
-             && "Hidden name is not a macro!");
+      assert(getKind() == MacroVisibility && "Hidden name is not a macro!");
       return std::make_pair(Id, MD);
     }
-
-    SourceLocation getMacroUndefLoc() const {
-      assert(getKind() == MacroUndef && "Hidden name is not an undef!");
-      return SourceLocation::getFromRawEncoding(Loc);
-    }
 };
 
   /// \brief A set of hidden declarations.
diff --git a/lib/Serialization/ASTReader.cpp b/lib/Serialization/ASTReader.cpp
index 4c4b953f97..649b4fcdd4 100644
--- a/lib/Serialization/ASTReader.cpp
+++ b/lib/Serialization/ASTReader.cpp
@@ -2738,11 +2738,6 @@ void ASTReader::makeNamesVisible(const HiddenNames &Names) {
       installImportedMacro(Macro.first, Macro.second);
       break;
     }
-
-    case HiddenName::MacroUndef: {
-      // FIXME: Remove HiddenName::MacroUndef.
-      break;
-    }
     }
   }
 }