Remove DependencyRecorder::Mode

Author: CodaFi

include/swift/AST/EvaluatorDependencies.h

@@ -179,27 +179,17 @@ struct DependencyCollector {
 struct DependencyRecorder {
   friend DependencyCollector;
 
-  enum class Mode {
-    // Enables the status quo of recording direct dependencies.
-    //
-    // This mode restricts the dependency collector to ignore changes of
-    // scope. This has practical effect of charging all unqualified lookups to
-    // the primary file being acted upon instead of to the destination file.
-    DirectDependencies,
-  };
-
 private:
   /// A stack of dependency sources in the order they were evaluated.
   llvm::SmallVector<evaluator::DependencySource, 8> dependencySources;
   llvm::DenseMap<SourceFile *, DependencyCollector::ReferenceSet>
       fileReferences;
   llvm::DenseMap<AnyRequest, DependencyCollector::ReferenceSet>
       requestReferences;
-  Mode mode;
   bool isRecording;
 
 public:
-  explicit DependencyRecorder(Mode mode) : mode{mode}, isRecording{false} {};
+  explicit DependencyRecorder() : isRecording{false} {};
 
 private:
   /// Records the given \c Reference as a dependency of the current dependency
@@ -272,10 +262,7 @@ struct DependencyRecorder {
   evaluator::DependencySource getActiveDependencySourceOrNull() const {
     if (dependencySources.empty())
       return nullptr;
-    switch (mode) {
-    case Mode::DirectDependencies:
-      return dependencySources.front();
-    }
+    return dependencySources.front();
   }
 
 public:

lib/AST/Evaluator.cpp

@@ -66,7 +66,7 @@ Evaluator::Evaluator(DiagnosticEngine &diags, const LangOptions &opts)
     : diags(diags),
       debugDumpCycles(opts.DebugDumpCycles),
       buildDependencyGraph(opts.BuildRequestDependencyGraph),
-      recorder{evaluator::DependencyRecorder::Mode::DirectDependencies} {}
+      recorder{} {}
 
 void Evaluator::emitRequestEvaluatorGraphViz(llvm::StringRef graphVizPath) {
   std::error_code error;
@@ -380,31 +380,23 @@ void evaluator::DependencyRecorder::realize(
 
 void evaluator::DependencyCollector::addUsedMember(NominalTypeDecl *subject,
                                                    DeclBaseName name) {
-  if (parent.mode == DependencyRecorder::Mode::DirectDependencies) {
-    scratch.insert(Reference::usedMember(subject, name));
-  }
+  scratch.insert(Reference::usedMember(subject, name));
   return parent.realize(Reference::usedMember(subject, name));
 }
 
 void evaluator::DependencyCollector::addPotentialMember(
     NominalTypeDecl *subject) {
-  if (parent.mode == DependencyRecorder::Mode::DirectDependencies) {
-    scratch.insert(Reference::potentialMember(subject));
-  }
+  scratch.insert(Reference::potentialMember(subject));
   return parent.realize(Reference::potentialMember(subject));
 }
 
 void evaluator::DependencyCollector::addTopLevelName(DeclBaseName name) {
-  if (parent.mode == DependencyRecorder::Mode::DirectDependencies) {
-    scratch.insert(Reference::topLevel(name));
-  }
+  scratch.insert(Reference::topLevel(name));
   return parent.realize(Reference::topLevel(name));
 }
 
 void evaluator::DependencyCollector::addDynamicLookupName(DeclBaseName name) {
-  if (parent.mode == DependencyRecorder::Mode::DirectDependencies) {
-    scratch.insert(Reference::dynamic(name));
-  }
+  scratch.insert(Reference::dynamic(name));
   return parent.realize(Reference::dynamic(name));
 }