Fix property wrapper crasher #27619
Merged
Fix property wrapper crasher #27619
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
Due to insufficiently robust argument emission code, certain combinations of language features could cause a call to a property wrapper backing initalizer to have mismatched argument types, causing an assertion failure in SILGenApply. This commit moves SILGenFunction::emitApplyOfPropertyWrapperBackingInitializer() into SILGenApply so it can use CallEmission and PreparedArguments to emit the call with full generality. Fixes rdar://problem/55995892.
|
@swift-ci please smoke test |
DougGregor
approved these changes
Oct 11, 2019
gottesmm
reviewed
Oct 11, 2019
| LookUpConformanceInModule(varDC->getParentModule())); | ||
| } | ||
|
|
||
| FormalEvaluationScope writebackScope(*this); |
There was a problem hiding this comment.
You may want an argument scope here instead of a FormalEvaluationScope: @slavapestov your thoughts?
There was a problem hiding this comment.
Or actually, that may already be in CallEmission. I forgot.
There was a problem hiding this comment.
It looks like CallEmission::apply() calls CallEmission::applyFirstLevelCallee(), which calls CallEmission::applyNormalCall(), which creates an ArgumentScope before it calls CallEmission::emitArgumentsForNormalApply(). So I think ArgumentScope is covered, if I understand its purpose correctly.
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.
Due to insufficiently robust argument emission code, certain combinations of language features could cause a call to a property wrapper backing initializer to prepare the argument incorrectly, causing an assertion failure in SILGenApply. This commit moves
SILGenFunction::emitApplyOfPropertyWrapperBackingInitializer()into SILGenApply so it can useCallEmissionandPreparedArgumentsto emit the call with full generality.Fixes rdar://problem/55995892.
(I'm going to be honest: SIL-level generics are not my strong suit. I rewrote this function with full generality because I don't know how to fix it in a more targeted way, but I could be doing something very wrong that happens to pass all of our tests. Reviewers, please examine it closely.)