unify some of the repeated useStaticResourceDir logic

Author: owenv

Sources/SwiftDriver/Driver/Driver.swift

@@ -126,6 +126,9 @@ public struct Driver {
     frontendTargetInfo.targetVariant?.triple
   }
 
+  /// `true` if the driver should use the static resource directory.
+  let useStaticResourceDir: Bool
+
   /// The kind of driver.
   let driverKind: DriverKind
 
@@ -342,12 +345,21 @@ public struct Driver {
       try Self.applyWorkingDirectory(workingDirectory, to: &self.parsedOptions)
     }
 
+    let staticExecutable = parsedOptions.hasFlag(positive: .staticExecutable,
+                                                 negative: .noStaticExecutable,
+                                                 default: false)
+    let staticStdlib = parsedOptions.hasFlag(positive: .staticStdlib,
+                                             negative: .noStaticStdlib,
+                                             default: false)
+    self.useStaticResourceDir = staticExecutable || staticStdlib
+
     // Build the toolchain and determine target information.
     (self.toolchain, self.frontendTargetInfo, self.swiftCompilerPrefixArgs) =
         try Self.computeToolchain(
           &self.parsedOptions, diagnosticsEngine: diagnosticEngine,
           compilerMode: self.compilerMode, env: env,
-          executor: self.executor, fileSystem: fileSystem)
+          executor: self.executor, fileSystem: fileSystem,
+          useStaticResourceDir: self.useStaticResourceDir)
 
     // Classify and collect all of the input files.
     let inputFiles = try Self.collectInputFiles(&self.parsedOptions)
@@ -1933,7 +1945,8 @@ extension Driver {
     compilerMode: CompilerMode,
     env: [String: String],
     executor: DriverExecutor,
-    fileSystem: FileSystem
+    fileSystem: FileSystem,
+    useStaticResourceDir: Bool
   ) throws -> (Toolchain, FrontendTargetInfo, [String]) {
     let explicitTarget = (parsedOptions.getLastArgument(.target)?.asSingle)
       .map {
@@ -1952,16 +1965,6 @@ extension Driver {
       resourceDirPath = nil
     }
 
-    var useStaticResourceDir = false
-    if parsedOptions.hasFlag(positive: .staticExecutable,
-                            negative: .noStaticExecutable,
-                            default: false) ||
-       parsedOptions.hasFlag(positive: .staticStdlib,
-                            negative: .noStaticStdlib,
-                            default: false) {
-      useStaticResourceDir = true
-    }
-
     let toolchainType = try explicitTarget?.toolchainType(diagnosticsEngine) ??
           defaultToolchainType
     // Find tools directory and pass it down to the toolchain

Sources/SwiftDriver/Jobs/FrontendJobHelpers.swift

@@ -193,12 +193,7 @@ extension Driver {
     commandLine.appendFlag(.resourceDir)
     commandLine.appendPath(frontendTargetInfo.runtimeResourcePath.path)
 
-    if parsedOptions.hasFlag(positive: .staticExecutable,
-                             negative: .noStaticExecutable,
-                             default: false) ||
-       parsedOptions.hasFlag(positive: .staticStdlib,
-                             negative: .noStaticStdlib,
-                             default: false) {
+    if self.useStaticResourceDir {
       commandLine.appendFlag("-use-static-resource-dir")
     }
 

Sources/SwiftDriver/Jobs/Planning.swift

@@ -438,15 +438,6 @@ extension Driver {
     if parsedOptions.hasArgument(.printTargetInfo) {
       let sdkPath = try parsedOptions.getLastArgument(.sdk).map { try VirtualPath(path: $0.asSingle) }
       let resourceDirPath = try parsedOptions.getLastArgument(.resourceDir).map { try VirtualPath(path: $0.asSingle) }
-      var useStaticResourceDir = false
-      if parsedOptions.hasFlag(positive: .staticExecutable,
-                              negative: .noStaticExecutable,
-                              default: false) ||
-         parsedOptions.hasFlag(positive: .staticStdlib,
-                              negative: .noStaticStdlib,
-                              default: false) {
-        useStaticResourceDir = true
-      }
 
       return try toolchain.printTargetInfoJob(target: targetTriple,
                                               targetVariant: targetVariantTriple,