[5.4][Deserialization] Fix error when typealias required by protocol refers to type in @_implementationOnly module #37490
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
…s to type in @_implementationOnly module In the added test case, the `typealias` refers to the `HiddenStruct` type in the private module, which is imported as `@_implementationOnly`. Because the import is `@_implementationOnly`, during deserialization, we don’t import the private module and hence any reference to the `HiddenStruct` type fails. In the common deserialization code path, this causes us to skip over the `typealias` member. However, when creating the protocol conformance, we assume that we can resolve the type to which the `typealias` refers and thus we are crashing. If `LangOpts.EnableDeserializationRecovery` is set to `true`, we should do our best to recover from such failures so this patch makes the deserialization failure handling more graceful and resolve the right-hand side of the `typealias` as an `ErrorType`. Fixes rdar://72891807
|
@swift-ci Please test |
|
@swift-ci Please nominate |
akyrtzi
approved these changes
May 18, 2021
|
Build failed |
|
@swift-ci Please test Linux |
AnthonyLatsis
added
swift 5.4
🍒 release cherry pick
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.
Cherry-picks #37011 to
release/5.4.Explanation: If a
typealiasrefers to a type defined in a module which is imported as@_implementationOnly, deserialization fails (crashes). IfLangOpts.EnableDeserializationRecoveryis set totrue(e.g. in SourceKit), we should recover from such failures more graceful and resolve unknown type as anErrorType.Scope: Modules that previously failed to deserialize
Risk: Low (we were previously crashing in all cases that exhibit new behavior)
Testing: Added test case to the test suite
Issue: rdar://78035645
Reviewer: Argyrios Kyrtzidis (@akyrtzi), Alexis Laferriere (@xymus)