PrebuiltModuleGen: dedupe prebuilt module jobs #1972
Conversation
|
@swift-ci please test |
| var seen: Set<String> = [] | ||
| var result: [Job] = [] | ||
| for job in jobs { | ||
| assert(job.outputs.count == 1) |
There was a problem hiding this comment.
Would be worthwhile to also assert on job kind being an emit module from interface here.
There was a problem hiding this comment.
I actually changed the fix of deduping to an earlier step. Mind taking another look?
| var result: [Job] = [] | ||
| for job in jobs { | ||
| assert(job.outputs.count == 1) | ||
| let key = job.outputs.first!.file.absolutePath!.pathString |
There was a problem hiding this comment.
Instead of file, it should be sufficient to have the hash set operate on fileHandle, as those will map to the same underlying absolute path string, and it won't be necessary to do .absolutePath!.pathString.
| @@ -772,6 +772,21 @@ extension Driver { | |||
| return allJobs | |||
| } | |||
|
|
|||
| /// Dedupe jobs by output paths | |||
| func dedupeJobs(_ jobs: [Job]) -> [Job] { | |||
There was a problem hiding this comment.
Nit: something like dedupeCompileSwiftModuleFromInterfaceJobs would be a more-descriptive name
…ules. We collect these Swift module names from the outputs of dependency scanning. However, we've noticed dupes in the output, leading to build system reporting fatal errors. As a fix, we dedupe the module names before generating prebuilt module cache. rdar://158615938
|
@swift-ci please smoke test |
nkcsgexi
changed the title
|
@swift-ci please smoke test |
|
@swift-ci please smoke test |
1 similar comment
|
@swift-ci please smoke test |
|
@swift-ci please test |
|
@swift-ci please test Windows |
1 similar comment
|
@swift-ci please test Windows |
|
@swift-ci please clean test Windows |
This prevents issues that we can find same module in multiple different locations.
rdar://158615938