Remove LegacyCascadingDependencies

Author: CodaFi

include/swift/AST/EvaluatorDependencies.h

@@ -186,13 +186,6 @@ struct DependencyRecorder {
     // scope. This has practical effect of charging all unqualified lookups to
     // the primary file being acted upon instead of to the destination file.
     DirectDependencies,
-    // Enables a legacy mode of dependency tracking that makes a distinction
-    // between private and cascading edges, and does not directly capture
-    // transitive dependencies.
-    //
-    // By default, the dependency collector moves to register dependencies in
-    // the referenced name trackers at the top of the active dependency stack.
-    LegacyCascadingDependencies,
   };
 
 private:
@@ -280,8 +273,6 @@ struct DependencyRecorder {
     if (dependencySources.empty())
       return nullptr;
     switch (mode) {
-    case Mode::LegacyCascadingDependencies:
-      return dependencySources.back();
     case Mode::DirectDependencies:
       return dependencySources.front();
     }

include/swift/Basic/LangOptions.h

@@ -359,10 +359,6 @@ namespace swift {
     /// conformances.
     bool EnableExperimentalAdditiveArithmeticDerivedConformances = false;
 
-    /// Whether to enable a more aggressive mode of incremental dependency
-    /// gathering that never captures cascading edges.
-    bool DirectIntramoduleDependencies = true;
-
     /// Enable verification when every SubstitutionMap is constructed.
     bool VerifyAllSubstitutionMaps = false;
 

lib/AST/Evaluator.cpp

@@ -62,21 +62,11 @@ void Evaluator::registerRequestFunctions(
   requestFunctionsByZone.push_back({zoneID, functions});
 }
 
-static evaluator::DependencyRecorder::Mode
-computeDependencyModeFromFlags(const LangOptions &opts) {
-  using Mode = evaluator::DependencyRecorder::Mode;
-  if (opts.DirectIntramoduleDependencies) {
-    return Mode::DirectDependencies;
-  }
-
-  return Mode::LegacyCascadingDependencies;
-}
-
 Evaluator::Evaluator(DiagnosticEngine &diags, const LangOptions &opts)
     : diags(diags),
       debugDumpCycles(opts.DebugDumpCycles),
       buildDependencyGraph(opts.BuildRequestDependencyGraph),
-      recorder{computeDependencyModeFromFlags(opts)} {}
+      recorder{evaluator::DependencyRecorder::Mode::DirectDependencies} {}
 
 void Evaluator::emitRequestEvaluatorGraphViz(llvm::StringRef graphVizPath) {
   std::error_code error;
@@ -444,10 +434,6 @@ void evaluator::DependencyRecorder::replay(
   assert(!isRecording && "Probably not a good idea to allow nested recording");
 
   auto source = getActiveDependencySourceOrNull();
-  if (mode == Mode::LegacyCascadingDependencies) {
-    return;
-  }
-
   if (source.isNull() || !source.get()->isPrimary()) {
     return;
   }
@@ -496,7 +482,6 @@ void evaluator::DependencyRecorder::replay(
 void evaluator::DependencyRecorder::unionNearestCachedRequest(
     ArrayRef<swift::ActiveRequest> stack,
     const DependencyCollector::ReferenceSet &scratch) {
-  assert(mode != Mode::LegacyCascadingDependencies);
   auto nearest = std::find_if(stack.rbegin(), stack.rend(),
                               [](const auto &req){ return req.isCached(); });
   if (nearest == stack.rend()) {

lib/Driver/ToolChains.cpp

@@ -281,9 +281,6 @@ void ToolChain::addCommonFrontendArgs(const OutputInfo &OI,
       options::OPT_disable_fuzzy_forward_scan_trailing_closure_matching);
   inputArgs.AddLastArg(arguments,
                        options::OPT_verify_incremental_dependencies);
-  inputArgs.AddLastArg(arguments,
-                       options::OPT_enable_direct_intramodule_dependencies,
-                       options::OPT_disable_direct_intramodule_dependencies);
 
   // Pass on any build config options
   inputArgs.AddAllArgs(arguments, options::OPT_D);

lib/Frontend/CompilerInvocation.cpp

@@ -453,11 +453,6 @@ static bool ParseLangArgs(LangOptions &Opts, ArgList &Args,
   if (Args.hasArg(OPT_enable_experimental_additive_arithmetic_derivation))
     Opts.EnableExperimentalAdditiveArithmeticDerivedConformances = true;
 
-  Opts.DirectIntramoduleDependencies =
-      Args.hasFlag(OPT_enable_direct_intramodule_dependencies,
-                   OPT_disable_direct_intramodule_dependencies,
-                   Opts.DirectIntramoduleDependencies);
-
   Opts.EnableExperimentalForwardModeDifferentiation |=
       Args.hasArg(OPT_enable_experimental_forward_mode_differentiation);
 

unittests/AST/ArithmeticEvaluator.cpp

@@ -222,7 +222,6 @@ TEST(ArithmeticEvaluator, Simple) {
   LangOptions opts;
   opts.DebugDumpCycles = false;
   opts.BuildRequestDependencyGraph = true;
-  opts.DirectIntramoduleDependencies = false;
   Evaluator evaluator(diags, opts);
   evaluator.registerRequestFunctions(Zone::ArithmeticEvaluator,
                                      arithmeticRequestFunctions);
@@ -349,7 +348,6 @@ TEST(ArithmeticEvaluator, Cycle) {
   LangOptions opts;
   opts.DebugDumpCycles = false;
   opts.BuildRequestDependencyGraph = false;
-  opts.DirectIntramoduleDependencies = false;
   Evaluator evaluator(diags, opts);
   evaluator.registerRequestFunctions(Zone::ArithmeticEvaluator,
                                      arithmeticRequestFunctions);