[6.2 🍒][Dependency Scanning] On cycle via overlay, fix Clang dependency path reconstruction #82738
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Cherry-pick of #82659
Explanation: When encountering a cycle in the module dependencies, the dependency scanner emits an error diagnostic and prints out the cycle. Oftentimes, the cycle involves a dependency from one Swift module to another (e.g .
A->B) which is not a direct import dependency but rather a Swift Overlay dependency via a transitive clang import. For example, if SwiftAdepends on Clang moduleC, which depends on clang moduleB, thenB's Swift overlay will be considered a Swift Overlay dependency ofA. In those cases, the scanner will also emit a note to highlight the Clang overlay dependency path (here:A->C->B). When computing this path, the scanner should only consider Clang module dependencies and it previously mistakenly was not, which led to, at times, misleading notes emitted. This change fixes this path computation to only consider Clang module dependencies, instead of all dependencies.Scope: Builds which fail due to a module cycle which involves Swift Overlay dependencies.
Risk: Low. This code path only affects builds which already fail and only affects computation of the contents for a helpful diagnostic note.
Reviewed By: @cachemeifyoucan
Original PR: [Dependency Scanning] On cycle via overlay, fix Clang dependency path reconstruction #82659