Remove Argument Parsing For Source Ranges

Author: CodaFi

include/swift/Driver/Compilation.h

@@ -259,9 +259,6 @@ class Compilation {
   /// needed.
   const bool EmitFineGrainedDependencyDotFileAfterEveryImport;
 
-  /// Experiment with source-range-based dependencies
-  const bool EnableSourceRangeDependencies;
-
   /// (experimental) Enable cross-module incremental build scheduling.
   const bool EnableCrossModuleIncrementalBuild;
 
@@ -298,9 +295,6 @@ class Compilation {
               bool OnlyOneDependencyFile = false,
               bool VerifyFineGrainedDependencyGraphAfterEveryImport = false,
               bool EmitFineGrainedDependencyDotFileAfterEveryImport = false,
-              bool EnableSourceRangeDependencies = false,
-              bool CompareIncrementalSchemes = false,
-              StringRef CompareIncrementalSchemesPath = "",
               bool EnableCrossModuleIncrementalBuild = false);
   // clang-format on
   ~Compilation();
@@ -367,10 +361,6 @@ class Compilation {
     return EmitFineGrainedDependencyDotFileAfterEveryImport;
   }
 
-  bool getEnableSourceRangeDependencies() const {
-    return EnableSourceRangeDependencies;
-  }
-
   bool getBatchModeEnabled() const {
     return EnableBatchMode;
   }

include/swift/Driver/Driver.h

@@ -305,8 +305,7 @@ class Driver {
   /// Construct the OutputFileMap for the driver from the given arguments.
   Optional<OutputFileMap>
   buildOutputFileMap(const llvm::opt::DerivedArgList &Args,
-                     StringRef workingDirectory,
-                     bool addEntriesForSourceRangeDependencies) const;
+                     StringRef workingDirectory) const;
 
   /// Add top-level Jobs to Compilation \p C for the given \p Actions and
   /// OutputInfo.

include/swift/Option/Options.td

@@ -147,26 +147,6 @@ def disable_only_one_dependency_file :
 Flag<["-"], "disable-only-one-dependency-file">, Flags<[DoesNotAffectIncrementalBuild]>,
  HelpText<"Disables incremental build optimization that only produces one dependencies file">;
 
-
-def enable_source_range_dependencies :
-Flag<["-"], "enable-source-range-dependencies">, Flags<[]>,
-HelpText<"Try using source range information">;
-
-
-def driver_compare_incremental_schemes :
-Flag<["-"], "driver-compare-incremental-schemes">, Flags<[DoesNotAffectIncrementalBuild]>,
-HelpText<"Print a simple message comparing dependencies with source ranges (w/ fallback)">;
-
-def driver_compare_incremental_schemes_path :
-Separate<["-"], "driver-compare-incremental-schemes-path">, Flags<[ArgumentIsPath,DoesNotAffectIncrementalBuild]>,
-HelpText<"Path to use for machine-readable comparison">,
-MetaVarName<"<path>">;
-
-def driver_compare_incremental_schemes_path_EQ :
-Joined<["-"], "driver-compare-incremental-schemes-path=">, Flags<[]>,
-Alias<driver_compare_incremental_schemes_path>;
-
-
 def driver_verify_fine_grained_dependency_graph_after_every_import :
 Flag<["-"], "driver-verify-fine-grained-dependency-graph-after-every-import">,
 InternalDebugOpt,

lib/Driver/CMakeLists.txt

@@ -6,7 +6,6 @@ set(swiftDriver_sources
   DarwinToolChains.cpp
   SourceComparator.cpp
   Driver.cpp
-  DriverIncrementalRanges.cpp
   FineGrainedDependencyDriverGraph.cpp
   FrontendUtil.cpp
   Job.cpp

lib/Driver/Compilation.cpp

@@ -26,7 +26,6 @@
 #include "swift/Basic/type_traits.h"
 #include "swift/Driver/Action.h"
 #include "swift/Driver/Driver.h"
-#include "swift/Driver/DriverIncrementalRanges.h"
 #include "swift/Driver/FineGrainedDependencyDriverGraph.h"
 #include "swift/Driver/Job.h"
 #include "swift/Driver/ToolChain.h"
@@ -125,9 +124,6 @@ Compilation::Compilation(DiagnosticEngine &Diags,
                          bool OnlyOneDependencyFile,
                          bool VerifyFineGrainedDependencyGraphAfterEveryImport,
                          bool EmitFineGrainedDependencyDotFileAfterEveryImport,
-                         bool EnableSourceRangeDependencies,
-                         bool CompareIncrementalSchemes,
-                         StringRef CompareIncrementalSchemesPath,
                          bool EnableCrossModuleIncrementalBuild)
   : Diags(Diags), TheToolChain(TC),
     TheOutputInfo(OI),
@@ -153,7 +149,6 @@ Compilation::Compilation(DiagnosticEngine &Diags,
       VerifyFineGrainedDependencyGraphAfterEveryImport),
     EmitFineGrainedDependencyDotFileAfterEveryImport(
       EmitFineGrainedDependencyDotFileAfterEveryImport),
-    EnableSourceRangeDependencies(EnableSourceRangeDependencies),
     EnableCrossModuleIncrementalBuild(EnableCrossModuleIncrementalBuild)
     { };
 // clang-format on
@@ -282,7 +277,6 @@ namespace driver {
     /// Dependency graphs for deciding which jobs are dirty (need running)
     /// or clean (can be skipped).
     fine_grained_dependencies::ModuleDepGraph FineGrainedDepGraph;
-    fine_grained_dependencies::ModuleDepGraph FineGrainedDepGraphForRanges;
 
   private:
     /// TaskQueue for execution.

lib/Driver/Driver.cpp

@@ -457,7 +457,6 @@ static std::string
 populateOutOfDateMap(InputInfoMap &map, llvm::sys::TimePoint<> &LastBuildTime,
                      StringRef argsHashStr, const InputFileList &inputs,
                      StringRef buildRecordPath,
-                     const bool EnableSourceRangeDependencies,
                      const bool ShowIncrementalBuildDecisions) {
   // Treat a missing file as "no previous build".
   auto buffer = llvm::MemoryBuffer::getFile(buildRecordPath);
@@ -916,18 +915,8 @@ Driver::buildCompilation(const ToolChain &TC,
     // REPL mode expects no input files, so suppress the error.
     SuppressNoInputFilesError = true;
 
-  const bool EnableSourceRangeDependencies =
-      ArgList->hasArg(options::OPT_enable_source_range_dependencies);
-  const bool CompareIncrementalSchemes =
-      ArgList->hasArg(options::OPT_driver_compare_incremental_schemes) ||
-      ArgList->hasArg(options::OPT_driver_compare_incremental_schemes_path);
-  const StringRef CompareIncrementalSchemesPath = ArgList->getLastArgValue(
-      options::OPT_driver_compare_incremental_schemes_path);
-
   Optional<OutputFileMap> OFM = buildOutputFileMap(
-      *TranslatedArgList, workingDirectory,
-      /*addEntriesForSourceFileDependencies=*/EnableSourceRangeDependencies ||
-          CompareIncrementalSchemes);
+      *TranslatedArgList, workingDirectory);
 
   if (Diags.hadAnyError())
     return nullptr;
@@ -960,7 +949,6 @@ Driver::buildCompilation(const ToolChain &TC,
                 ? "no build record path"
                 : populateOutOfDateMap(outOfDateMap, LastBuildTime, ArgsHash,
                                        Inputs, buildRecordPath,
-                                       EnableSourceRangeDependencies,
                                        ShowIncrementalBuildDecisions);
   // FIXME: Distinguish errors from "file removed", which is benign.
 
@@ -1045,9 +1033,6 @@ Driver::buildCompilation(const ToolChain &TC,
         OnlyOneDependencyFile,
         VerifyFineGrainedDependencyGraphAfterEveryImport,
         EmitFineGrainedDependencyDotFileAfterEveryImport,
-        EnableSourceRangeDependencies,
-        CompareIncrementalSchemes,
-        CompareIncrementalSchemesPath,
         EnableCrossModuleDependencies);
     // clang-format on
   }
@@ -1844,10 +1829,6 @@ Driver::computeCompilerMode(const DerivedArgList &Args,
                               options::OPT_disable_batch_mode,
                               false);
 
-  // For best unparsed ranges, want non-batch mode, standard compile
-  const Arg *ArgRequiringSinglePrimaryCompile =
-      Args.getLastArg(options::OPT_enable_source_range_dependencies);
-
   // AST dump doesn't work with `-wmo`. Since it's not common to want to dump
   // the AST, we assume that's the priority and ignore `-wmo`, but we warn the
   // user about this decision.
@@ -1867,9 +1848,6 @@ Driver::computeCompilerMode(const DerivedArgList &Args,
       Diags.diagnose(SourceLoc(), diag::warn_ignoring_batch_mode,
                      ArgRequiringSingleCompile->getOption().getPrefixedName());
     }
-    if (ArgRequiringSinglePrimaryCompile)
-      Diags.diagnose(SourceLoc(), diag::warn_ignoring_source_range_dependencies,
-                     ArgRequiringSingleCompile->getOption().getPrefixedName());
     return OutputInfo::Mode::SingleCompile;
   }
 
@@ -2371,8 +2349,7 @@ bool Driver::handleImmediateArgs(const ArgList &Args, const ToolChain &TC) {
 
 Optional<OutputFileMap>
 Driver::buildOutputFileMap(const llvm::opt::DerivedArgList &Args,
-                           StringRef workingDirectory,
-                           bool addEntriesForSourceFileDependencies) const {
+                           StringRef workingDirectory) const {
   const Arg *A = Args.getLastArg(options::OPT_output_file_map);
   if (!A)
     return None;

lib/Driver/Job.cpp

@@ -11,7 +11,6 @@
 //===----------------------------------------------------------------------===//
 
 #include "swift/Basic/STLExtras.h"
-#include "swift/Driver/DriverIncrementalRanges.h"
 #include "swift/Driver/Job.h"
 #include "swift/Driver/PrettyStackTrace.h"
 #include "llvm/ADT/STLExtras.h"