Merge pull request #604 from nkcsgexi/foundation-fail

PrebuiltModuleGen: consider failures of Foundation and anything below critical

Author: nkcsgexi

Sources/SwiftDriver/Jobs/PrebuiltModulesJob.swift

@@ -12,29 +12,28 @@
 import TSCBasic
 import SwiftOptions
 
-func isIosMac(_ path: TypedVirtualPath) -> Bool {
+func isIosMac(_ path: VirtualPath) -> Bool {
   // Infer macabi interfaces by the file name.
   // FIXME: more robust way to do this.
-  return path.file.basenameWithoutExt.contains("macabi")
+  return path.basenameWithoutExt.contains("macabi")
 }
 
 public class PrebuitModuleGenerationDelegate: JobExecutionDelegate {
   var failingModules = Set<String>()
-  var succeededJobs: [Job] = []
   var commandMap: [Int: String] = [:]
   let diagnosticsEngine: DiagnosticsEngine
   let verbose: Bool
-  public init(_ diagnosticsEngine: DiagnosticsEngine, _ verbose: Bool) {
+  var failingCriticalOutputs: Set<VirtualPath>
+  public init(_ jobs: [Job], _ diagnosticsEngine: DiagnosticsEngine, _ verbose: Bool) {
     self.diagnosticsEngine = diagnosticsEngine
     self.verbose = verbose
+    self.failingCriticalOutputs = Set<VirtualPath>(jobs.compactMap(PrebuitModuleGenerationDelegate.getCriticalOutput))
   }
 
   /// Dangling jobs are macabi-only modules. We should run those jobs if foundation
   /// is built successfully for macabi.
   public var shouldRunDanglingJobs: Bool {
-    return succeededJobs.contains { job in
-      return isIosMac(job.outputs[0]) && job.moduleName == "Foundation"
-    }
+    return !failingCriticalOutputs.contains(where: isIosMac)
   }
   func printJobInfo(_ job: Job, _ start: Bool) {
     guard verbose else {
@@ -54,21 +53,25 @@ public class PrebuitModuleGenerationDelegate: JobExecutionDelegate {
     }
   }
 
+  static func getCriticalOutput(_ job: Job) -> VirtualPath? {
+    return job.moduleName == "Foundation" ? job.outputs[0].file : nil
+  }
+
   public func jobStarted(job: Job, arguments: [String], pid: Int) {
     commandMap[pid] = arguments.reduce("") { return $0 + " " + $1 }
     printJobInfo(job, true)
   }
 
-  public var hasStdlibFailure: Bool {
-    return failingModules.contains("Swift") || failingModules.contains("_Concurrency")
+  public var hasCriticalFailure: Bool {
+    return !failingCriticalOutputs.isEmpty
   }
 
   public func jobFinished(job: Job, result: ProcessResult, pid: Int) {
     switch result.exitStatus {
     case .terminated(code: let code):
       if code == 0 {
         printJobInfo(job, false)
-        succeededJobs.append(job)
+        failingCriticalOutputs.remove(job.outputs[0].file)
       } else {
         failingModules.insert(job.moduleName)
         let result: String = try! result.utf8stderrOutput()
@@ -254,7 +257,7 @@ extension Driver {
       commandLine.appendFlag(.parseStdlib)
     }
     // Add macabi-specific search path.
-    if isIosMac(inputPath.path) {
+    if isIosMac(inputPath.path.file) {
       commandLine.appendFlag(.Fsystem)
       commandLine.append(.path(iosMacFrameworksSearchPath))
     }

Sources/swift-build-sdk-interfaces/main.swift

@@ -107,13 +107,13 @@ do {
                             executor: executor,
                             compilerExecutableDir: swiftcPath.parentDirectory)
     let (jobs, danglingJobs) = try driver.generatePrebuitModuleGenerationJobs(with: inputMap, into: outputDir, exhaustive: !coreMode)
-    let delegate = PrebuitModuleGenerationDelegate(diagnosticsEngine, verbose)
+    let delegate = PrebuitModuleGenerationDelegate(jobs, diagnosticsEngine, verbose)
     do {
       try executor.execute(workload: DriverExecutorWorkload.init(jobs, nil, continueBuildingAfterErrors: true),
                            delegate: delegate, numParallelJobs: 128)
     } catch {
-      // Only fail the process if stdlib failed
-      if delegate.hasStdlibFailure {
+      // Only fail when critical failures happened.
+      if delegate.hasCriticalFailure {
         exit(1)
       }
     }