[Clang importer] Look through typealiases when importing members of swift_wrappers. #9302
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 and merge |
DougGregor
force-pushed
the
swift-wrapper-renamed
branch
from
80cbaed to
41cde06
Compare
|
@swift-ci please smoke test and merge |
1 similar comment
|
@swift-ci please smoke test and merge |
jrose-apple
reviewed
May 4, 2017
lib/ClangImporter/ImportDecl.cpp
Outdated
| @@ -7378,6 +7379,8 @@ ClangImporter::Implementation::importDeclContextOf( | |||
| auto decl = importDecl(clangDecl, CurrentVersion); | |||
| if (!decl) return nullptr; | |||
|
|
|||
| importedDC = dynCastIgnoringCompatibilityAlias<NominalTypeDecl>(decl); | |||
There was a problem hiding this comment.
You didn't take out the old code here.
…wift_wrappers. When a swift_wrapper'd type is renamed from Swift 3 -> 4, we create a typealias for it. We need to look through that typealias when deserializing members of that type, e.g., global variables of the swift_wrapper'd type.
DougGregor
force-pushed
the
swift-wrapper-renamed
branch
from
41cde06 to
5934a86
Compare
|
@swift-ci please smoke test and merge |
1 similar comment
|
@swift-ci please smoke test and merge |
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.
When a swift_wrapper'd type is renamed from Swift 3 -> 4, we create a
typealias for it. We need to look through that typealias when
deserializing members of that type, e.g., global variables of the
swift_wrapper'd type.
Fixes rdar://problem/31939047.