diff options
author | Erich Keane <erich.keane@intel.com> | 2017-12-11 18:14:51 +0000 |
---|---|---|
committer | Erich Keane <erich.keane@intel.com> | 2017-12-11 18:14:51 +0000 |
commit | d2dd52d1df034f6060a06604d2be1743285cfcae (patch) | |
tree | ce99442b5948063e1b36a346c0180faaac3810cf /lib/Frontend | |
parent | 84bf555dbe0c7836c8f67eea29a7cc9390b897bf (diff) |
Revert 320391: Certain targets are failing, pulling back to diagnose.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@320398 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Frontend')
-rw-r--r-- | lib/Frontend/CompilerInvocation.cpp | 4 | ||||
-rw-r--r-- | lib/Frontend/InitPreprocessor.cpp | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/lib/Frontend/CompilerInvocation.cpp b/lib/Frontend/CompilerInvocation.cpp index 60802da921..2ebdc2a62a 100644 --- a/lib/Frontend/CompilerInvocation.cpp +++ b/lib/Frontend/CompilerInvocation.cpp @@ -2611,10 +2611,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/lib/Frontend/InitPreprocessor.cpp b/lib/Frontend/InitPreprocessor.cpp index 45760ae15e..d398904943 100644 --- a/lib/Frontend/InitPreprocessor.cpp +++ b/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. @@ -1142,13 +1133,6 @@ void clang::InitializePreprocessor( 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. for (unsigned i = 0, e = InitOpts.MacroIncludes.size(); i != e; ++i) |