[6.2] use RespectOriginallyDefinedIn when mangling extension contexts #82657
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Resolves rdar://152598492 Consider the following Swift, adapted from a real-world framework: ```swift @available(macOS 10.8, *) @_originallyDefinedIn(module: "another", macOS 11.0) public struct SimpleStruct {} @available(macOS 12.0, iOS 13.0, *) public extension SimpleStruct { struct InnerStruct {} } ``` In this scenario, `SimpleStruct` was originally in a module called `another`, but was migrated to this module around the time of macOS 11.0. Since then, the module was ported to iOS and gained a nested type `SimpleStruct.InnerStruct`. When mangling USRs for this nested type, the result differs depending on whether we're targeting macOS or iOS. They're mostly the same, but the macOS build yields a USR with an `AAE` infix, designating that the `InnerStruct` was defined in an extension from a module with the name of the base module. On iOS, this infix does not exist. The reason this is happening is because of the implementation of `getAlternateModuleName` checking the availability spec in the `@_originallyDefinedIn` attribute against the currently active target. If the target matches the spec, then the alternate module name is reported, otherwise the real module name is. Since the iOS build reports the real module name, the mangling code doesn't bother including the extension-context infix, instead just opting to include the parent type's name and moving on. This PR routes around this issue by passing the `RespectOriginallyDefinedIn` variable to the `ExtensionDecl::isInSameDefiningModule` method, and using that to skip the alternate module name entirely. It also sets `RespectOriginallyDefinedIn` to `false` in more places when mangling USRs, but i'm not 100% confident that it was all necessary. The goal was to make USRs more consistent across platforms, regardless of the surrounding context.
Contributor
Author
|
@swift-ci Please test |
tbkka
approved these changes
Jun 30, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
AAE) when an extended type uses@_originallyDefinedInon platforms other than the active one. This adds a check for theRespectOriginallyDefinedInflag when checking extension decls against their extended type.