[Type checking] A declaration in an overlay can shadow an imported declaration. #16951
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
…claration. If a declaration provided in a Swift overlay has the same signature as a declaration imported from the Clang module it overlays, or some private framework that re-exports its interface through that Clang module, the declaration provided in the Swift overlay shadows the one imported from Clang. To make this work for unqualified lookup, allow the shadowing rules to kick in there as well. Make this a very narrow fix, because the underlying problems that prevented us from doing this shadowing still persist. Fixes rdar://problem/35691030 and its several dupes.
|
@swift-ci please smoke test |
jrose-apple
reviewed
Jun 1, 2018
| // Prefer declarations in an overlay to similar declarations in | ||
| // the Clang module it customizes. | ||
| if (firstDecl->hasClangNode() != secondDecl->hasClangNode()) { | ||
| if (isInOverlayModuleForImportedModule(firstDecl->getDeclContext(), |
There was a problem hiding this comment.
This is definitely a layering violation. Should it be an API on ClangModuleLoader instead?
There was a problem hiding this comment.
Oh, that's a good point. I have no idea how this linked on Linux.
There was a problem hiding this comment.
Eliminated the layering violation in #16993
DougGregor
added a commit
to DougGregor/swift
that referenced
this pull request
Jun 4, 2018
…leForImportedModule. swiftlang#16951 introduced a layering violation between the AST and ClangImporter libraries; break the layering violation by moving the function isInOverlayModuleForImportedModule() to ClangModuleLoader.
kitasuke
pushed a commit
to kitasuke/swift
that referenced
this pull request
Jun 9, 2018
…leForImportedModule. swiftlang#16951 introduced a layering violation between the AST and ClangImporter libraries; break the layering violation by moving the function isInOverlayModuleForImportedModule() to ClangModuleLoader.
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.
If a declaration provided in a Swift overlay has the same signature as
a declaration imported from the Clang module it overlays, or some
private framework that re-exports its interface through that Clang
module, the declaration provided in the Swift overlay shadows the one
imported from Clang.
To make this work for unqualified lookup, allow the shadowing rules to
kick in there as well. Make this a very narrow fix, because the
underlying problems that prevented us from doing this shadowing still
persist.
Fixes rdar://problem/35691030 and its several dupes.