[ClangImporter] Add versioned stubs for import-as-member renames. #8272
Conversation
This file contains 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
If a top-level declaration is imported as a member in Swift 4 but not in Swift 3, it would still show up in the lookup table for the containing type in Swift 3 mode. We would import it, and then try to add the top-level declaration to the containing type. I'm about to redo this anyway so that the versioned stub will show up (the one for the Swift 4 name) but this is the narrow fix that avoids the assertion failure we were seeing. rdar://problem/31161489
A more general solution to ae458a8: import all versions of a name that are going to show up as members, ignore those that aren't. Further work on <rdar://problem/29170671> Import APIs under their Swift 3 names.
|
(I'm going to wait for Michael's review on this one, but merge the other one as soon as possible to fix the crash.) @swift-ci Please test |
|
Build failed |
|
The Linux failure was in LLDB? I suspect it's nothing, but let's go again. @swift-ci Please test Linux |
|
@swift-ci Please smoke test macOS |
|
Build failed |
|
Linux build got interrupted, but it looks like it made it through all the tests. @swift-ci Please smoke test Linux |
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.
Builds on #8269 with a more general solution: import all versions of a name that are going to show up as members, ignore those that aren't.
Further work on <rdar://problem/29170671> Import APIs under their Swift 3 names.