Merge pull request #1527 from owenv/pr/ovoorhees/emb-incremental-fix

owenv · web-flow · commit 1ef0e3e6a95f · 2024-01-22T09:14:32.000-08:00
Fix explicit modules incremental build failure when only the clang module of a mixed-source module requires rebuild
diff --git a/Sources/SwiftDriver/IncrementalCompilation/IncrementalDependencyAndInputSetup.swift b/Sources/SwiftDriver/IncrementalCompilation/IncrementalDependencyAndInputSetup.swift
@@ -211,7 +211,7 @@ extension IncrementalCompilationState.IncrementalDependencyAndInputSetup {
                                                     buildRecordInfo: BuildRecordInfo,
                                                     reporter: IncrementalCompilationState.Reporter?) throws -> Bool {
     for module in graph.modules {
-      if module.key.moduleName == graph.mainModuleName {
+      if module.key == .swift(graph.mainModuleName) {
         continue
       }
       if try !verifyModuleDependencyUpToDate(moduleID: module.key, 

Original file line number	Diff line number	Diff line change
`@@ -211,7 +211,7 @@ extension IncrementalCompilationState.IncrementalDependencyAndInputSetup {`
`211`	`211`	`buildRecordInfo: BuildRecordInfo,`
`212`	`212`	`reporter: IncrementalCompilationState.Reporter?) throws -> Bool {`
`213`	`213`	`for module in graph.modules {`
`214`		`- if module.key.moduleName == graph.mainModuleName {`
	`214`	`+ if module.key == .swift(graph.mainModuleName) {`
`215`	`215`	`continue`
`216`	`216`	`}`
`217`	`217`	`if try !verifyModuleDependencyUpToDate(moduleID: module.key,`