2 files changed, 0 insertions, 20 deletions
diff --git a/clang/lib/Frontend/CompilerInvocation.cpp b/clang/lib/Frontend/CompilerInvocation.cpp
index 748c7ffbcdf..384124bee2b 100644
--- a/clang/lib/Frontend/CompilerInvocation.cpp
+++ b/clang/lib/Frontend/CompilerInvocation.cpp
@@ -2594,10 +2594,6 @@ static void ParsePreprocessorArgs(PreprocessorOptions &Opts, ArgList &Args,
   for (const Arg *A : Args.filtered(OPT_chain_include))
     Opts.ChainedIncludes.emplace_back(A->getValue());
 
-  // Add the ordered list of -fsystem-include-if-exists.
-  for (const Arg *A : Args.filtered(OPT_fsystem_include_if_exists))
-    Opts.FSystemIncludeIfExists.emplace_back(A->getValue());
-
   for (const Arg *A : Args.filtered(OPT_remap_file)) {
     std::pair<StringRef, StringRef> Split = StringRef(A->getValue()).split(';');
 
diff --git a/clang/lib/Frontend/InitPreprocessor.cpp b/clang/lib/Frontend/InitPreprocessor.cpp
index 6980706a90d..1dfbf187554 100644
--- a/clang/lib/Frontend/InitPreprocessor.cpp
+++ b/clang/lib/Frontend/InitPreprocessor.cpp
@@ -70,15 +70,6 @@ static void AddImplicitInclude(MacroBuilder &Builder, StringRef File) {
   Builder.append(Twine("#include \"") + File + "\"");
 }
 
-/// AddImplicitSystemIncludeIfExists - Add an implicit system \#include of the 
-/// specified file to the predefines buffer: precheck with __has_include.
-static void AddImplicitSystemIncludeIfExists(MacroBuilder &Builder, 
-                                             StringRef File) {
-  Builder.append(Twine("#if __has_include( <") + File + ">)");
-  Builder.append(Twine("#include <") + File + ">");
-  Builder.append(Twine("#endif"));
-}
-
 static void AddImplicitIncludeMacros(MacroBuilder &Builder, StringRef File) {
   Builder.append(Twine("#__include_macros \"") + File + "\"");
   // Marker token to stop the __include_macros fetch loop.
@@ -1119,13 +1110,6 @@ void clang::InitializePreprocessor(
   // Exit the command line and go back to <built-in> (2 is LC_LEAVE).
   if (!PP.getLangOpts().AsmPreprocessor)
     Builder.append("# 1 \"<built-in>\" 2");
-  
-  // Process -fsystem-include-if-exists directives.
-  for (unsigned i = 0, 
-       e = InitOpts.FSystemIncludeIfExists.size(); i != e; ++i) {
-    const std::string &Path = InitOpts.FSystemIncludeIfExists[i];
-    AddImplicitSystemIncludeIfExists(Builder, Path);
-  }
 
   // If -imacros are specified, include them now.  These are processed before
   // any -include directives.