diff options
| author | Nico Weber <nicolasweber@gmx.de> | 2019-10-03 02:38:43 +0000 |
|---|---|---|
| committer | Nico Weber <nicolasweber@gmx.de> | 2019-10-03 02:38:43 +0000 |
| commit | c10a6a0580e007991d1e3c7e6cb120c6289d1f7c (patch) | |
| tree | 9b1e2697324d6d333a5ee8f62a0437da33be28a0 /lib/Driver/Types.cpp | |
| parent | 5a376e2cb9be9cdb0146b7d5e4598554455bfb53 (diff) | |
| download | clang-c10a6a0580e007991d1e3c7e6cb120c6289d1f7c.tar.gz | |
Revert 373538 and follow-ups 373549 and 373552.
They break tests on (at least) macOS.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@373556 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/Driver/Types.cpp')
| -rw-r--r-- | lib/Driver/Types.cpp | 18 |
1 files changed, 1 insertions, 17 deletions
diff --git a/lib/Driver/Types.cpp b/lib/Driver/Types.cpp index 6241fac0c8..da01e1acfc 100644 --- a/lib/Driver/Types.cpp +++ b/lib/Driver/Types.cpp @@ -269,7 +269,6 @@ types::ID types::lookupTypeForExtension(llvm::StringRef Ext) { .Case("lib", TY_Object) .Case("mii", TY_PP_ObjCXX) .Case("obj", TY_Object) - .Case("ifs", TY_IFS) .Case("pch", TY_PCH) .Case("pcm", TY_ModuleFile) .Case("c++m", TY_CXXModule) @@ -320,22 +319,6 @@ void types::getCompilationPhases(const clang::driver::Driver &Driver, llvm::copy_if(PhaseList, std::back_inserter(P), [](phases::ID Phase) { return Phase <= phases::Precompile; }); - // Treat Interface Stubs like its own compilation mode. - else if (DAL.getLastArg(options::OPT_emit_iterface_stubs)) { - llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases> IfsModePhaseList; - llvm::SmallVector<phases::ID, phases::MaxNumberOfPhases> &PL = PhaseList; - phases::ID LastPhase = phases::IfsMerge; - if (Id != types::TY_IFS) { - if (DAL.hasArg(options::OPT_c)) - LastPhase = phases::Compile; - PL = IfsModePhaseList; - types::getCompilationPhases(types::TY_IFS_CPP, PL); - } - llvm::copy_if(PL, std::back_inserter(P), [&](phases::ID Phase) { - return Phase <= LastPhase; - }); - } - // -{fsyntax-only,-analyze,emit-ast} only run up to the compiler. else if (DAL.getLastArg(options::OPT_fsyntax_only) || DAL.getLastArg(options::OPT_print_supported_cpus) || @@ -344,6 +327,7 @@ void types::getCompilationPhases(const clang::driver::Driver &Driver, DAL.getLastArg(options::OPT_rewrite_objc) || DAL.getLastArg(options::OPT_rewrite_legacy_objc) || DAL.getLastArg(options::OPT__migrate) || + DAL.getLastArg(options::OPT_emit_iterface_stubs) || DAL.getLastArg(options::OPT__analyze) || DAL.getLastArg(options::OPT_emit_ast)) llvm::copy_if(PhaseList, std::back_inserter(P), |