[SymbolGraphGen] Refactor export-import logic #61049
Merged
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
rdar://98808363 functionally reverts #58421
… extensions consider this scenario: - module A - struct BaseStruct - module B - struct BaseStruct.InnerStruct - func BaseStruct.InnerStruct.doStuff() - module C - `@_exported import B` the current export-import code effectively short-circuits if the direct parent of a symbol is from a re-exported module. however, that symbol could itself be another extension, so the check needs to recurse _first_, to catch this scenario. before this change, `BaseStruct.InnerStruct.doStuff()` would be sorted into C's main module graph, but `BaseStruct.InnerStruct` would be sorted into `C@A` instead, creating an orphan symbol.
Contributor
Author
|
@swift-ci Please test |
franklinsch
approved these changes
Sep 13, 2022
| @@ -0,0 +1,12 @@ | |||
| // RUN: %empty-directory(%t) | |||
| // RUN: cp -r %S/Inputs/ExportedImport/ObjcProperty.framework %t | |||
| // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module -o %t/ObjcProperty.framework/Modules/ObjcProperty.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t -module-name ObjcProperty %S/Inputs/ExportedImport/A.swift | |||
Contributor
There was a problem hiding this comment.
Is it worth also having a separate test for swift-symbolgraph-extract?
Contributor
Author
There was a problem hiding this comment.
swift-symbolgraph-extract doesn't have support for processing re-exports (#59920) so any tests i add for that will just confirm that the symbols don't exist.
QuietMisdreavus
added a commit
that referenced
this pull request
Sep 14, 2022
QuietMisdreavus
added a commit
that referenced
this pull request
Sep 17, 2022
This was referenced Dec 5, 2022
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.
Resolves rdar://98808363, fixes #60771
This PR fixes a handful of rough edges surrounding re-exported modules, extensions, and Clang symbols:
These issues primarily occur when a module re-exports Foundation, but the patterns can be recreated outside of Foundation.