3 files changed, 0 insertions, 32 deletions
diff --git a/include/clang/Basic/DiagnosticLexKinds.td b/include/clang/Basic/DiagnosticLexKinds.td
index d7ed55a81f..46e0bebb3e 100644
--- a/include/clang/Basic/DiagnosticLexKinds.td
+++ b/include/clang/Basic/DiagnosticLexKinds.td
@@ -292,15 +292,6 @@ def warn_has_warning_invalid_option :
    ExtWarn<"__has_warning expected option name (e.g. \"-Wundef\")">,
    InGroup<MalformedWarningCheck>;
 
-def warn_pragma_include_alias_mismatch :
-   ExtWarn<"pragma include_alias requires matching include directives "
-   "(e.g include_alias(\"foo.h\", \"bar.h\") or "
-   "include_alias(<foo.h>, <bar.h>))">,
-   InGroup<UnknownPragmas>;
-def warn_pragma_include_alias_expected :
-   ExtWarn<"pragma include_alias expected '%0'">,
-   InGroup<UnknownPragmas>;
-
 def err__Pragma_malformed : Error<
   "_Pragma takes a parenthesized string literal">;
 def err_pragma_comment_malformed : Error<
diff --git a/include/clang/Lex/HeaderSearch.h b/include/clang/Lex/HeaderSearch.h
index f4b6876c72..84bb37da3a 100644
--- a/include/clang/Lex/HeaderSearch.h
+++ b/include/clang/Lex/HeaderSearch.h
@@ -154,9 +154,6 @@ class HeaderSearch {
   llvm::StringMap<const DirectoryEntry *, llvm::BumpPtrAllocator>
     FrameworkMap;
 
-  llvm::StringMap<std::pair<StringRef, bool>, llvm::BumpPtrAllocator>
-    IncludeAliasMap;
-
   /// HeaderMaps - This is a mapping from FileEntry -> HeaderMap, uniquing
   /// headermaps.  This vector owns the headermap.
   std::vector<std::pair<const FileEntry*, const HeaderMap*> > HeaderMaps;
@@ -220,25 +217,6 @@ public:
     SystemDirIdx++;
   }
 
-  /// AddHeaderMapping -- Map the source include name to the dest include name
-  void AddHeaderMapping(const StringRef& Source, const StringRef& Dest, 
-                        bool IsAngled) {
-    IncludeAliasMap[Source] = std::make_pair(Dest, IsAngled);
-  }
-
-  StringRef MapHeader(const StringRef& Source, bool isAngled) {
-    // Do any filename replacements before anything else
-    llvm::StringMap<std::pair<StringRef,bool> >::const_iterator iter = 
-      IncludeAliasMap.find(Source);
-    if (iter != IncludeAliasMap.end()) {
-      // If the angling matches, then we've found a replacement
-      if (iter->second.second == isAngled) {
-        return iter->second.first;
-      }
-    }
-    return Source;
-  }
-
   /// \brief Set the path to the module cache.
   void setModuleCachePath(StringRef CachePath) {
     ModuleCachePath = CachePath;
diff --git a/include/clang/Lex/Preprocessor.h b/include/clang/Lex/Preprocessor.h
index 9ee9e82529..feed6a8bfa 100644
--- a/include/clang/Lex/Preprocessor.h
+++ b/include/clang/Lex/Preprocessor.h
@@ -1262,7 +1262,6 @@ public:
   void HandlePragmaMessage(Token &MessageTok);
   void HandlePragmaPushMacro(Token &Tok);
   void HandlePragmaPopMacro(Token &Tok);
-  void HandlePragmaIncludeAlias(Token &Tok);
   IdentifierInfo *ParsePragmaPushOrPopMacro(Token &Tok);
 
   // Return true and store the first token only if any CommentHandler