[sil-combine] Fix a bug in the convert_function peephole #12162
Merged
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
Bail if the return type of the converted function is different from the return type of the apply instruction. Fixes rdar://problem/34603304
slavapestov
reviewed
Sep 28, 2017
| // Bail if the result type of the converted callee is different from the callee's | ||
| // result type of the apply instruction. | ||
| if (SubstCalleeTy->getAllResultsType() != ConvertCalleeTy->getAllResultsType()) { | ||
| return nullptr; |
There was a problem hiding this comment.
When parameter types don't match you emit an unchecked ref cast, you could do the same for the return value too.
There was a problem hiding this comment.
It may result in introducing new BBs for the try_apply. And we don't want to generate new BBs in sil-combine.
| @@ -417,6 +417,12 @@ SILCombiner::optimizeApplyOfConvertFunctionInst(FullApplySite AI, | |||
| if (SubstCalleeTy->hasArchetype() || ConvertCalleeTy->hasArchetype()) | |||
There was a problem hiding this comment.
I feel like this restriction is completely unnecessary.
There was a problem hiding this comment.
May be, but this is not the part of this bug-fix patch.
There was a problem hiding this comment.
Please try removing it in another patch and see what breaks :-)
|
@swift-ci please test |
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.
Bail if the return type of the converted function is different from the
return type of the apply instruction.
Fixes rdar://problem/34603304