[NFC] Have Evaluator's Constructor Read LangOptions

It's a touch cleaner to do this than passing around a pile of bools.

Author: CodaFi

include/swift/AST/Evaluator.h

@@ -243,10 +243,7 @@ class Evaluator {
 public:
   /// Construct a new evaluator that can emit cyclic-dependency
   /// diagnostics through the given diagnostics engine.
-  Evaluator(DiagnosticEngine &diags,
-            bool debugDumpCycles,
-            bool buildDependencyGraph,
-            bool enableExperimentalPrivateDeps);
+  Evaluator(DiagnosticEngine &diags, const LangOptions &opts);
 
   /// Emit GraphViz output visualizing the request graph.
   void emitRequestEvaluatorGraphViz(llvm::StringRef graphVizPath);

lib/AST/ASTContext.cpp

@@ -549,10 +549,7 @@ ASTContext::ASTContext(LangOptions &langOpts, TypeCheckerOptions &typeckOpts,
   : LangOpts(langOpts),
     TypeCheckerOpts(typeckOpts),
     SearchPathOpts(SearchPathOpts), SourceMgr(SourceMgr), Diags(Diags),
-    evaluator(Diags,
-              langOpts.DebugDumpCycles,
-              langOpts.BuildRequestDependencyGraph,
-              langOpts.EnableExperientalPrivateIntransitiveDependencies),
+    evaluator(Diags, langOpts),
     TheBuiltinModule(createBuiltinModule(*this)),
     StdlibModuleName(getIdentifier(STDLIB_NAME)),
     SwiftShimsModuleName(getIdentifier(SWIFT_SHIMS_NAME)),

lib/AST/Evaluator.cpp

@@ -16,6 +16,7 @@
 //===----------------------------------------------------------------------===//
 #include "swift/AST/Evaluator.h"
 #include "swift/AST/DiagnosticEngine.h"
+#include "swift/Basic/LangOptions.h"
 #include "swift/Basic/Range.h"
 #include "swift/Basic/SourceManager.h"
 #include "llvm/ADT/StringExtras.h"
@@ -62,21 +63,20 @@ void Evaluator::registerRequestFunctions(
 }
 
 static evaluator::DependencyRecorder::Mode
-computeDependencyModeFromFlags(bool enableExperimentalPrivateDeps) {
+computeDependencyModeFromFlags(const LangOptions &opts) {
   using Mode = evaluator::DependencyRecorder::Mode;
-  if (enableExperimentalPrivateDeps) {
+  if (opts.EnableExperientalPrivateIntransitiveDependencies) {
     return Mode::ExperimentalPrivateDependencies;
   }
 
   return Mode::StatusQuo;
 }
 
-Evaluator::Evaluator(DiagnosticEngine &diags, bool debugDumpCycles,
-                     bool buildDependencyGraph,
-                     bool enableExperimentalPrivateDeps)
-    : diags(diags), debugDumpCycles(debugDumpCycles),
-      buildDependencyGraph(buildDependencyGraph),
-      recorder{computeDependencyModeFromFlags(enableExperimentalPrivateDeps)} {}
+Evaluator::Evaluator(DiagnosticEngine &diags, const LangOptions &opts)
+    : diags(diags),
+      debugDumpCycles(opts.DebugDumpCycles),
+      buildDependencyGraph(opts.BuildRequestDependencyGraph),
+      recorder{computeDependencyModeFromFlags(opts)} {}
 
 void Evaluator::emitRequestEvaluatorGraphViz(llvm::StringRef graphVizPath) {
   std::error_code error;

unittests/AST/ArithmeticEvaluator.cpp

@@ -16,6 +16,7 @@
 #include "swift/AST/DiagnosticEngine.h"
 #include "swift/AST/Evaluator.h"
 #include "swift/AST/SimpleRequest.h"
+#include "swift/Basic/LangOptions.h"
 #include "swift/Basic/SourceManager.h"
 #include "gtest/gtest.h"
 #include <cmath>
@@ -218,10 +219,11 @@ TEST(ArithmeticEvaluator, Simple) {
 
   SourceManager sourceMgr;
   DiagnosticEngine diags(sourceMgr);
-  Evaluator evaluator(diags,
-                      /*debugDumpCycles=*/false,
-                      /*buildDependencyGraph=*/true,
-                      /*privateDependencies*/false);
+  LangOptions opts;
+  opts.DebugDumpCycles = false;
+  opts.BuildRequestDependencyGraph = true;
+  opts.EnableExperientalPrivateIntransitiveDependencies = false;
+  Evaluator evaluator(diags, opts);
   evaluator.registerRequestFunctions(Zone::ArithmeticEvaluator,
                                      arithmeticRequestFunctions);
 
@@ -344,10 +346,11 @@ TEST(ArithmeticEvaluator, Cycle) {
 
   SourceManager sourceMgr;
   DiagnosticEngine diags(sourceMgr);
-  Evaluator evaluator(diags,
-                      /*debugDumpCycles=*/false,
-                      /*buildDependencyGraph=*/false,
-                      /*privateDependencies*/false);
+  LangOptions opts;
+  opts.DebugDumpCycles = false;
+  opts.BuildRequestDependencyGraph = false;
+  opts.EnableExperientalPrivateIntransitiveDependencies = false;
+  Evaluator evaluator(diags, opts);
   evaluator.registerRequestFunctions(Zone::ArithmeticEvaluator,
                                      arithmeticRequestFunctions);