Merge pull request #297 from davidungar/incremental-10-9b

Add a `primaryInputs` field to `Job` which will be needed for incremental compilation.
apple · Oct 10, 2020 · 5ae9bd8 · 5ae9bd8
2 parents 095937c + 9c66cc8
commit 5ae9bd8
Show file tree

Hide file tree

Showing 21 changed files with 43 additions and 13 deletions.
diff --git a/Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift b/Sources/SwiftDriver/Explicit Module Builds/ExplicitModuleBuildHandler.swift
@@ -187,6 +187,7 @@ public typealias ExternalBuildArtifacts = (ExternalTargetModulePathMap, ModuleIn
       tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs
     )
   }
@@ -232,6 +233,7 @@ public typealias ExternalBuildArtifacts = (ExternalTargetModulePathMap, ModuleIn
       tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs
     )
   }

diff --git a/Sources/SwiftDriver/Explicit Module Builds/ModuleDependencyScanning.swift b/Sources/SwiftDriver/Explicit Module Builds/ModuleDependencyScanning.swift
@@ -48,6 +48,7 @@ extension Driver {
                commandLine: commandLine,
                displayInputs: inputs,
                inputs: inputs,
+               primaryInputs: [],
                outputs: [TypedVirtualPath(file: .standardOutput, type: .jsonDependencies)],
                supportsResponseFiles: true)
   }
@@ -156,6 +157,7 @@ extension Driver {
                commandLine: commandLine,
                displayInputs: inputs,
                inputs: inputs,
+               primaryInputs: [],
                outputs: outputs,
                supportsResponseFiles: true)
   }

diff --git a/Sources/SwiftDriver/Jobs/AutolinkExtractJob.swift b/Sources/SwiftDriver/Jobs/AutolinkExtractJob.swift
@@ -34,6 +34,7 @@ extension Driver {
       tool: .absolute(try toolchain.getToolPath(.swiftAutolinkExtract)),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: [.init(file: output, type: .autolink)],
       supportsResponseFiles: true
     )

diff --git a/Sources/SwiftDriver/Jobs/BackendJob.swift b/Sources/SwiftDriver/Jobs/BackendJob.swift
@@ -72,6 +72,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: inputs,
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs,
       supportsResponseFiles: true
     )

diff --git a/Sources/SwiftDriver/Jobs/CompileJob.swift b/Sources/SwiftDriver/Jobs/CompileJob.swift
@@ -267,6 +267,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: primaryInputs,
       inputs: inputs,
+      primaryInputs: primaryInputs,
       outputs: outputs,
       supportsResponseFiles: true
     )

diff --git a/Sources/SwiftDriver/Jobs/EmitModuleJob.swift b/Sources/SwiftDriver/Jobs/EmitModuleJob.swift
@@ -75,6 +75,7 @@ extension Driver {
       tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs
     )
   }

diff --git a/Sources/SwiftDriver/Jobs/GenerateDSYMJob.swift b/Sources/SwiftDriver/Jobs/GenerateDSYMJob.swift
@@ -29,6 +29,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: [],
       inputs: inputs,
+      primaryInputs: [],
       outputs: [.init(file: outputPath, type: .dSYM)]
     )
   }

diff --git a/Sources/SwiftDriver/Jobs/GeneratePCHJob.swift b/Sources/SwiftDriver/Jobs/GeneratePCHJob.swift
@@ -68,6 +68,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: [],
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs,
       supportsResponseFiles: true
     )

diff --git a/Sources/SwiftDriver/Jobs/GeneratePCMJob.swift b/Sources/SwiftDriver/Jobs/GeneratePCMJob.swift
@@ -59,6 +59,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: [],
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs
     )
   }

diff --git a/Sources/SwiftDriver/Jobs/InterpretJob.swift b/Sources/SwiftDriver/Jobs/InterpretJob.swift
@@ -46,6 +46,7 @@ extension Driver {
       tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: [],
       extraEnvironment: extraEnvironment,
       requiresInPlaceExecution: true,

diff --git a/Sources/SwiftDriver/Jobs/Job.swift b/Sources/SwiftDriver/Jobs/Job.swift
@@ -70,6 +70,9 @@ public struct Job: Codable, Equatable, Hashable {
   /// The list of inputs for this job.
   public var inputs: [TypedVirtualPath]
 
+  /// The primary inputs for compile jobs
+  public var primaryInputs: [TypedVirtualPath]
+
   /// The outputs produced by the job.
   public var outputs: [TypedVirtualPath]
 
@@ -89,6 +92,7 @@ public struct Job: Codable, Equatable, Hashable {
     commandLine: [ArgTemplate],
     displayInputs: [TypedVirtualPath]? = nil,
     inputs: [TypedVirtualPath],
+    primaryInputs: [TypedVirtualPath],
     outputs: [TypedVirtualPath],
     extraEnvironment: [String: String] = [:],
     requiresInPlaceExecution: Bool = false,
@@ -100,6 +104,7 @@ public struct Job: Codable, Equatable, Hashable {
     self.commandLine = commandLine
     self.displayInputs = displayInputs ?? []
     self.inputs = inputs
+    self.primaryInputs = primaryInputs
     self.outputs = outputs
     self.extraEnvironment = extraEnvironment
     self.requiresInPlaceExecution = requiresInPlaceExecution

diff --git a/Sources/SwiftDriver/Jobs/LinkJob.swift b/Sources/SwiftDriver/Jobs/LinkJob.swift
@@ -58,6 +58,7 @@ extension Driver {
       tool: .absolute(toolPath),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: [.init(file: outputFile, type: .image)]
     )
   }

diff --git a/Sources/SwiftDriver/Jobs/MergeModuleJob.swift b/Sources/SwiftDriver/Jobs/MergeModuleJob.swift
@@ -67,6 +67,7 @@ extension Driver {
       tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
       commandLine: commandLine,
       inputs: inputs,
+      primaryInputs: [],
       outputs: outputs,
       supportsResponseFiles: true
     )

diff --git a/Sources/SwiftDriver/Jobs/ModuleWrapJob.swift b/Sources/SwiftDriver/Jobs/ModuleWrapJob.swift
@@ -32,6 +32,7 @@ extension Driver {
       tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
       commandLine: commandLine,
       inputs: [moduleInput],
+      primaryInputs: [],
       outputs: [.init(file: outputPath, type: .object)],
       supportsResponseFiles: true
     )

diff --git a/Sources/SwiftDriver/Jobs/Planning.swift b/Sources/SwiftDriver/Jobs/Planning.swift
@@ -472,6 +472,7 @@ extension Driver {
         tool: .absolute(try toolchain.getToolPath(.swiftCompiler)),
         commandLine: [.flag("--version")],
         inputs: [],
+        primaryInputs: [],
         outputs: [],
         requiresInPlaceExecution: true)
     }
@@ -487,6 +488,7 @@ extension Driver {
         tool: .absolute(try toolchain.getToolPath(.swiftHelp)),
         commandLine: commandLine,
         inputs: [],
+        primaryInputs: [],
         outputs: [],
         requiresInPlaceExecution: true)
     }

diff --git a/Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift b/Sources/SwiftDriver/Jobs/PrintTargetInfoJob.swift
@@ -165,6 +165,7 @@ extension Toolchain {
       commandLine: commandLine,
       displayInputs: [],
       inputs: [],
+      primaryInputs: [],
       outputs: [.init(file: .standardOutput, type: .jsonTargetInfo)],
       requiresInPlaceExecution: requiresInPlaceExecution,
       supportsResponseFiles: false

diff --git a/Sources/SwiftDriver/Jobs/ReplJob.swift b/Sources/SwiftDriver/Jobs/ReplJob.swift
@@ -29,6 +29,7 @@ extension Driver {
       tool: .absolute(try toolchain.getToolPath(.lldb)),
       commandLine: [Job.ArgTemplate.flag(lldbArg)],
       inputs: inputs,
+      primaryInputs: [],
       outputs: [],
       requiresInPlaceExecution: true
     )

diff --git a/Sources/SwiftDriver/Jobs/VerifyDebugInfoJob.swift b/Sources/SwiftDriver/Jobs/VerifyDebugInfoJob.swift
@@ -27,6 +27,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: [],
       inputs: inputs,
+      primaryInputs: [],
       outputs: []
     )
   }

diff --git a/Sources/SwiftDriver/Jobs/VerifyModuleInterfaceJob.swift b/Sources/SwiftDriver/Jobs/VerifyModuleInterfaceJob.swift
@@ -34,6 +34,7 @@ extension Driver {
       commandLine: commandLine,
       displayInputs: [],
       inputs: [interfaceInput],
+      primaryInputs: [],
       outputs: [outputFile]
     )
   }

diff --git a/Tests/SwiftDriverTests/JobExecutorTests.swift b/Tests/SwiftDriverTests/JobExecutorTests.swift
@@ -113,6 +113,11 @@ final class JobExecutorTests: XCTestCase {
         .relative(RelativePath("main")): exec.pathString,
       ]
 
+      let inputs: [String: TypedVirtualPath] = [
+        "foo" : .init(file: .relative(RelativePath( "foo.swift")), type: .swift),
+        "main": .init(file: .relative(RelativePath("main.swift")), type: .swift)
+      ]
+
       let compileFoo = Job(
         moduleName: "main",
         kind: .compile,
@@ -121,19 +126,17 @@ final class JobExecutorTests: XCTestCase {
           "-frontend",
           "-c",
           "-primary-file",
-          .path(.relative(RelativePath("foo.swift"))),
-          .path(.relative(RelativePath("main.swift"))),
+          .path(inputs[ "foo"]!.file),
+          .path(inputs["main"]!.file),
           "-target", "x86_64-apple-darwin18.7.0",
           "-enable-objc-interop",
           "-sdk",
           .path(.absolute(try toolchain.sdk.get())),
           "-module-name", "main",
           "-o", .path(.temporary(RelativePath("foo.o"))),
         ],
-        inputs: [
-          .init(file: .relative(RelativePath("foo.swift")), type: .swift),
-          .init(file: .relative(RelativePath("main.swift")), type: .swift),
-        ],
+        inputs: Array(inputs.values),
+        primaryInputs: [inputs["foo"]!],
         outputs: [.init(file: .temporary(RelativePath("foo.o")), type: .object)]
       )
 
@@ -146,18 +149,16 @@ final class JobExecutorTests: XCTestCase {
           "-c",
           .path(.relative(RelativePath("foo.swift"))),
           "-primary-file",
-          .path(.relative(RelativePath("main.swift"))),
+          .path(inputs["main"]!.file),
           "-target", "x86_64-apple-darwin18.7.0",
           "-enable-objc-interop",
           "-sdk",
           .path(.absolute(try toolchain.sdk.get())),
           "-module-name", "main",
           "-o", .path(.temporary(RelativePath("main.o"))),
         ],
-        inputs: [
-          .init(file: .relative(RelativePath("foo.swift")), type: .swift),
-          .init(file: .relative(RelativePath("main.swift")), type: .swift),
-        ],
+        inputs: Array(inputs.values),
+        primaryInputs: [inputs["main"]!],
         outputs: [.init(file: .temporary(RelativePath("main.o")), type: .object)]
       )
 
@@ -182,6 +183,7 @@ final class JobExecutorTests: XCTestCase {
           .init(file: .temporary(RelativePath("foo.o")), type: .object),
           .init(file: .temporary(RelativePath("main.o")), type: .object),
         ],
+        primaryInputs: [],
         outputs: [.init(file: .relative(RelativePath("main")), type: .image)]
       )
 
@@ -213,6 +215,7 @@ final class JobExecutorTests: XCTestCase {
       tool: .absolute(AbsolutePath("/usr/bin/swift")),
       commandLine: [.flag("something")],
       inputs: [],
+      primaryInputs: [],
       outputs: [.init(file: .temporary(RelativePath("main")), type: .object)]
     )
 

diff --git a/Tests/SwiftDriverTests/ModuleDependencyGraphTests.swift b/Tests/SwiftDriverTests/ModuleDependencyGraphTests.swift
@@ -1311,8 +1311,9 @@ extension Job {
                    kind: .compile,
                    tool: VirtualPath(path: ""),
                    commandLine: [],
-                   inputs:  [TypedVirtualPath(file: VirtualPath(path: dummyBaseName + ".swift"    ), type: .swift    )],
-                   outputs: [TypedVirtualPath(file: VirtualPath(path: dummyBaseName + ".swiftdeps"), type: .swiftDeps)])
+                   inputs:         [TypedVirtualPath(file: VirtualPath(path: dummyBaseName + ".swift"    ), type: .swift    )],
+                   primaryInputs:  [TypedVirtualPath(file: VirtualPath(path: dummyBaseName + ".swift"    ), type: .swift    )],
+                   outputs:        [TypedVirtualPath(file: VirtualPath(path: dummyBaseName + ".swiftdeps"), type: .swiftDeps)])
   }
 
 }