Merge pull request #270 from davidungar/refactoring-planStandardCompile

Refactoring plan standard compile

Author: David Ungar

Sources/SwiftDriver/Driver/CompilerMode.swift

@@ -62,6 +62,15 @@ extension CompilerMode {
     }
   }
 
+  public var isStandardCompilationForPlanning: Bool {
+    switch self {
+      case .immediate, .repl, .compilePCM:
+        return false
+      case .batchCompile, .standardCompile, .singleCompile:
+        return true
+    }
+  }
+
   // Whether this compilation mode supports the use of bridging pre-compiled
   // headers.
   public var supportsBridgingPCH: Bool {

Sources/SwiftDriver/Jobs/BackendJob.swift

@@ -15,7 +15,8 @@ import Foundation
 extension Driver {
   /// Form a backend job.
   mutating func backendJob(input: TypedVirtualPath,
-                           allOutputs: inout [TypedVirtualPath]) throws -> Job {
+                           addJobOutputs: ([TypedVirtualPath]) -> Void)
+  throws -> Job {
     var commandLine: [Job.ArgTemplate] = swiftCompilerPrefixArgs.map { Job.ArgTemplate.flag($0) }
     var inputs = [TypedVirtualPath]()
     var outputs = [TypedVirtualPath]()
@@ -62,7 +63,7 @@ extension Driver {
       outputs.append(output)
     }
 
-    allOutputs += outputs
+    addJobOutputs(outputs)
 
     return Job(
       moduleName: moduleOutputInfo.name,

Sources/SwiftDriver/Jobs/CompileJob.swift

@@ -157,8 +157,10 @@ extension Driver {
   }
 
   /// Form a compile job, which executes the Swift frontend to produce various outputs.
-  mutating func compileJob(primaryInputs: [TypedVirtualPath], outputType: FileType?,
-                           allOutputs: inout [TypedVirtualPath]) throws -> Job {
+  mutating func compileJob(primaryInputs: [TypedVirtualPath],
+                           outputType: FileType?,
+                           addJobOutputs: ([TypedVirtualPath]) -> Void)
+  throws -> Job {
     var commandLine: [Job.ArgTemplate] = swiftCompilerPrefixArgs.map { Job.ArgTemplate.flag($0) }
     var inputs: [TypedVirtualPath] = []
     var outputs: [TypedVirtualPath] = []
@@ -249,7 +251,7 @@ extension Driver {
     try commandLine.appendLast(.runtimeCompatibilityVersion, from: &parsedOptions)
     try commandLine.appendLast(.disableAutolinkingRuntimeCompatibilityDynamicReplacements, from: &parsedOptions)
 
-    allOutputs += outputs
+    addJobOutputs(outputs)
 
     // If we're creating emit module job, order the compile jobs after that.
     if shouldCreateEmitModuleJob {