YJIT: Fix getconstant exits after opt_ltlt fusion #10903
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
Co-authored-by: Alan Wu <alansi.xingwu@shopify.com>
|
Good work catching this bug. One thing that seems slightly annoying is that this would seem to create more blocks, and so increase memory usage? I will merge the PR because correctness is the most important, but I guess in the medium to long term we really want to propagate constants through the context, and/or come up with a better way to do op fusion 🤔 |
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.
Follow-up to #10401
This PR fixes a crash on SFR. When
opt_ltltfusion returnsSkipNextInsn, it updatesinsn_idxvariable to skip the next instruction. When the next instruction isopt_getconstant_path, it callsjump_to_next_insnbeforejit.insn_idx = insn_idx. For that reason,opt_getconstant_pathends up exiting with a wrong PC, using an oldinsn_idx.It also ends the block at
opt_ltltlike other method calls. It's probably nice to share the successor block by ending the block like in case the receiver class varies. So we removedSkipNextInsnand just made a jump.