Skip to content

[6.2 🍒][Dependency Scanning][C++ Interop] Do not skip lookup of 'CxxStdlib' overlay for the source module #82772

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged

Conversation

artemcm
Copy link
Contributor

@artemcm artemcm commented Jul 3, 2025

Cherry-pick of #82751

  • Explanation: A prior change ensured that we forego this query when looking up Swift overlays for a textual interface which was built without C++ interop. This change introduced a bug where it also caused us to skip this lookup for the main source module. This commit resolves that by preserving the fix above but also ensuring we perform the lookup for the main source module under scan.

  • Scope: C++ Interop-enabled builds with explicitly-built modules where the source module relies on the presence of the C++ standard library Swift overlay

  • Risk: Low. This code path only affects builds behind the combination of features (C++ Interop and EBM) which is currently opt-in. When this combination is enabled, this change simply adds a module dependency which is expected to always get resolved to a Swift module in the toolchain.

  • Reviewed By: @nkcsgexi

  • Original PR: [Dependency Scanning][C++ Interop] Do not skip lookup of 'CxxStdlib' overlay for the source module #82751

…overlay for the source module

A prior change ensured that we forego this query when looking up Swift overlays for a textual interface which was built without C++ interop. This change introduced a bug where it also caused us to skip this lookup for the main source module. This commit resolves that by preserving the fix above but also ensuring we perform the lookup for the main source module under scan.
@artemcm artemcm requested a review from nkcsgexi July 3, 2025 16:24
@artemcm artemcm requested a review from a team as a code owner July 3, 2025 16:24
@artemcm artemcm added 🍒 release cherry pick Flag: Release branch cherry picks swift 6.2 labels Jul 3, 2025
@artemcm
Copy link
Contributor Author

artemcm commented Jul 3, 2025

@swift-ci test

Copy link
Contributor

@nkcsgexi nkcsgexi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thank you!

@artemcm artemcm merged commit dc91d08 into swiftlang:release/6.2 Jul 7, 2025
5 checks passed
@artemcm artemcm deleted the 62_FixDepScanCxxStdlibLookup branch July 7, 2025 17:52
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
🍒 release cherry pick Flag: Release branch cherry picks swift 6.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants