[5.1][cast-opt] Fix miscompile when we tried to optimize take_on_success that resulted in invalid IR being emitted. #25074
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 test |
|
Build failed |
|
Build failed |
Importantly this lets us know further on in the function that as an invariant we only can have checked_cast_addr_br. (cherry picked from commit 13a3dbb)
…hat resulted in invalid IR being emitted. The specific problem here is that we are setting the insertion point of a SILBuilder and not unsetting it. I fixed the problem by creating a separate builder so the original builder stays put. I originally came across this in my work on moving ownership stripping after the diagnostic passes. This patch fixes it without my other changes to ease cherry-picking to 5.1. I also added more test coverage by expanding the test case to also handle copy_on_success and take_always. rdar://51093557 (cherry picked from commit ad67685)
gottesmm
force-pushed
the
swift-5.1-branch-rdar51093557
branch
from
e7b36da to
16e4d80
Compare
|
@swift-ci test |
|
Build failed |
|
Build failed |
|
I had to adjust a test for some differences from master -> 5.1. I put it in a separate commit on top. |
|
@swift-ci test |
|
Build failed |
|
Build failed |
|
@atrick this is the same one from master modulo small test changes to reflect cleanups that I did not do on 5.1 but did do on master. |
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.
[cast-opt] Fix miscompile when we tried to optimize take_on_success that resulted in invalid IR being emitted.
The specific problem here is that we are setting the insertion point of a
SILBuilder and not unsetting it. I fixed the problem by creating a separate
builder so the original builder stays put.
I originally came across this in my work on moving ownership stripping after the
diagnostic passes. This patch fixes it without my other changes to ease
cherry-picking to 5.1.
I also added more test coverage by expanding the test case to also handle
copy_on_success and take_always.
rdar://51093557
(cherry picked from commit ad67685)
NOTE: I also cherry-picked a small cleanup from master as well that eliminated a merge conflict on this code path. That is the first commit.