Merge pull request #1544 from cachemeifyoucan/eng/PR-main-module-scanner-args

cachemeifyoucan · web-flow · commit 41632637151a · 2024-02-13T09:33:55.000-08:00
[Caching] Fix scanner args were dropped when resolveMainModuleDependencies were called multiple times
diff --git a/Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift b/Sources/SwiftDriver/ExplicitModuleBuilds/ExplicitDependencyBuildPlanner.swift
@@ -405,7 +405,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT
       let mainModuleId: ModuleDependencyId = .swift(dependencyGraph.mainModuleName)
       let mainModuleDetails = try dependencyGraph.swiftModuleDetails(of: mainModuleId)
       if let additionalArgs = mainModuleDetails.commandLine {
-        additionalArgs.forEach { commandLine.appendFlag($0) }
+        additionalArgs.forEach { commandLineAdditions.appendFlag($0) }
       }
       commandLineAdditions.appendFlags("-disable-implicit-swift-modules",
                                        "-Xcc", "-fno-implicit-modules",

Original file line number	Diff line number	Diff line change
`@@ -405,7 +405,7 @@ public typealias ExternalTargetModuleDetailsMap = [ModuleDependencyId: ExternalT`
`405`	`405`	`let mainModuleId: ModuleDependencyId = .swift(dependencyGraph.mainModuleName)`
`406`	`406`	`let mainModuleDetails = try dependencyGraph.swiftModuleDetails(of: mainModuleId)`
`407`	`407`	`if let additionalArgs = mainModuleDetails.commandLine {`
`408`		`- additionalArgs.forEach { commandLine.appendFlag($0) }`
	`408`	`+ additionalArgs.forEach { commandLineAdditions.appendFlag($0) }`
`409`	`409`	`}`
`410`	`410`	`commandLineAdditions.appendFlags("-disable-implicit-swift-modules",`
`411`	`411`	`"-Xcc", "-fno-implicit-modules",`