[ModuleInterface] Ignore export_as in private swiftinterface #62476
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 |
xymus
changed the title
xymus
force-pushed
the
module-interface-export-as
branch
from
85ae6ec to
49f6ea9
Compare
|
@swift-ci Please smoke test |
xymus
force-pushed
the
module-interface-export-as
branch
from
49f6ea9 to
91a207f
Compare
|
@swift-ci Please smoke test |
|
I tried this version in a rather large project and it appears to work as desired, except for a single imported framework that didn't behave as expected. I suspect a conflict with the logic overriding the imported name to workaround poorly modularized clang modules. We can keep this behind a flag for now until we track down that issue. |
Introduce a new behavior when printing references to modules with an `export_as` definition. Use the `export_as` name in the public swiftinterface and the real module name in the private swiftinterface. This has some limits but should still be an improvement over the current behavior. First, the we use the `export_as` names only for references to clang decls, not Swift decls with an underlying module defining an `export_as`. Second, we always print the `export_as` name in the public swiftinterface, even in the original swiftinterface file when the `export_as` target is likely not know, so that generated swiftinterface is still broken. This behavior is enabled by the flags `-enable-experimental-feature ModuleInterfaceExportAs` or the `SWIFT_DEBUG_USE_EXPORTED_MODULE_NAME_IN_PUBLIC_ONLY` env var. We may consider turning it on by default in the future. rdar://98532918
xymus
force-pushed
the
module-interface-export-as
branch
from
91a207f to
ab38752
Compare
|
@swift-ci Please smoke test |
|
The issue with a single imported framework was likely just caused by a clang module cached while using different search paths. This shouldn't be a problem in practice. |
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.
Introduce a new behavior when printing references to modules with an
export_asdefinition. Use theexport_asname in the public swiftinterface and the real module name in the private swiftinterface.This has some limits but should still be an improvement over the current behavior. First, the we use the
export_asnames only for references to clang decls, not Swift decls with an underlying module defining anexport_as. Second, we always print theexport_asname in the public swiftinterface, even in the original swiftinterface file when theexport_astarget is likely not know, so that generated swiftinterface is still broken.This behavior is enabled by the flags
-enable-experimental-feature ModuleInterfaceExportAsor theSWIFT_DEBUG_USE_EXPORTED_MODULE_NAME_IN_PUBLIC_ONLYenv var. We may consider turning it on by default in the future.rdar://98532918