Skip to content

[5.3] Fix layering of cross-import and clang overlays #31222

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
merged 3 commits into from
Apr 23, 2020

Conversation

beccadax
Copy link
Contributor

Cherry-picks #31199 to release/5.3 branch:

If a clang module declares a cross-import overlay, but it also has a traditional overlay, we want the cross-import overlay to be registered with the SourceFile as sitting atop the traditional overlay. Otherwise module-qualified name lookups will bypass the cross-import overlay.

This PR also includes some NFC dumping improvements.

Fixes rdar://62139656

If a clang module declares a cross-import overlay, but it also has a traditional overlay, we want the cross-import overlay to be registered with the SourceFile as sitting atop the traditional overlay. Otherwise module-qualified name lookups will bypass the cross-import overlay.

Fixes rdar://62139656.
@beccadax beccadax added the r5.3 label Apr 22, 2020
@beccadax
Copy link
Contributor Author

@swift-ci please test

@swift-ci
Copy link
Contributor

Build failed
Swift Test OS X Platform
Git Sha - 557abcb

@beccadax
Copy link
Contributor Author

@swift-ci please test macOS platform

@beccadax
Copy link
Contributor Author

Original PR was reviewed by @CodaFi and @xymus.

@beccadax beccadax merged commit 028cc70 into swiftlang:release/5.3 Apr 23, 2020
@AnthonyLatsis AnthonyLatsis added swift 5.3 🍒 release cherry pick Flag: Release branch cherry picks labels Jan 8, 2023
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 5.3
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants