Merge pull request #2942 from artemcm/IntegratedDriverDerivedSources

[Integrated Swift driver] Handle derived source files in the integrated driver.

Author: artemcm

Sources/Build/BuildPlan.swift

@@ -702,7 +702,7 @@ public final class SwiftTargetBuildDescription {
         }
 
         result.append("-c")
-        result.append(contentsOf: target.sources.paths.map { $0.pathString })
+        result.append(contentsOf: sources.map { $0.pathString })
 
         result.append("-I")
         result.append(buildParameters.buildPath.pathString)
@@ -831,7 +831,7 @@ public final class SwiftTargetBuildDescription {
         stream <<< "  },\n"
 
         // Write out the entries for each source file.
-        let sources = target.sources.paths
+        let sources = target.sources.paths + derivedSources.paths
         for (idx, source) in sources.enumerated() {
             let object = objects[idx]
             let objectDir = object.parentDirectory

Sources/Build/ManifestBuilder.swift

@@ -362,8 +362,6 @@ extension LLBuildManifestBuilder {
 
         // Commands.
         try addExplicitBuildSwiftCmds(description, inputs: inputs,
-                                      objectNodes: objectNodes,
-                                      moduleNode: moduleNode,
                                       targetDepGraphMap: &targetDepGraphMap)
 
         addTargetCmd(description, cmdOutputs: cmdOutputs)
@@ -372,8 +370,7 @@ extension LLBuildManifestBuilder {
 
     private func addExplicitBuildSwiftCmds(
         _ targetDescription: SwiftTargetBuildDescription,
-        inputs: [Node], objectNodes: [Node], moduleNode: Node,
-        targetDepGraphMap: inout [ResolvedTarget: InterModuleDependencyGraph]
+        inputs: [Node], targetDepGraphMap: inout [ResolvedTarget: InterModuleDependencyGraph]
     ) throws {
         // Pass the driver its external dependencies (target dependencies)
         var targetDependencyMap: SwiftDriver.ExternalDependencyArtifactMap = [:]