[SymbolGraphGen] consider modules not equal if they're not from the same compiler #58421
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
|
@swift-ci Please smoke test |
franklinsch
approved these changes
Apr 27, 2022
| @@ -0,0 +1,19 @@ | |||
| // RUN: %empty-directory(%t) | |||
| // RUN: cp -r %S/Inputs/EmitWhileBuilding/EmitWhileBuilding.framework %t | |||
| // RUN: %target-swift-frontend(mock-sdk: %clang-importer-sdk) -enable-objc-interop -emit-module-path %t/EmitWhileBuilding.framework/Modules/EmitWhileBuilding.swiftmodule/%target-swiftmodule-name -import-underlying-module -F %t -module-name EmitWhileBuilding -disable-objc-attr-requires-foundation-module %s %S/Inputs/EmitWhileBuilding/Extra.swift -emit-symbol-graph -emit-symbol-graph-dir %t | |||
There was a problem hiding this comment.
Should we also have a test that checks the behavior when using swift-symbolgraph-extract, since the behaviors regarding @_export import are different?
There was a problem hiding this comment.
That makes sense! I'll write up a test and push it today.
|
@swift-ci Please smoke test |
franklinsch
approved these changes
Apr 28, 2022
|
@swift-ci Please smoke test and merge |
|
@swift-ci Please smoke test Linux |
QuietMisdreavus
added a commit
that referenced
this pull request
Sep 12, 2022
rdar://98808363 functionally reverts #58421
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://92263972
In #41577, symbols were lifted into the main module's symbol graph if they originated from an
@_exported importmodule. However, the comparison was based on the modules' names, which caused the comparison to spuriously consider symbols to be "re-exported" if an underlying Clang module was present.1 This PR tightens that check to also consider whether the modules being compared for re-exporting are both Swift or non-Swift modules.Footnotes
When
-import-underlying-moduleis given to the frontend, any headers considered to be part of the same module are aggregated into a separate module with the same name as the Swift module, which is then implicitly@_exported imported into the Swift module. As the comparison added in [SymbolGraphGen] Emit symbols from exported modules #41577 was based on the name of the module, this means that everything that was declared in the Swift module was considered to be re-exported, even if it is technically an extension on a foreign type! Check the test that was added in this PR for an example. ↩