gh-144681: Fix JIT trace builder assertion failure when conditional branch jump target coincides with fallthrough target #144742
+20
−1
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.
When the JIT trace builder translates
POP_JUMP_IF_TRUEinstructions, it determines the branch direction by comparingnext_instr(where execution actually went) againstcomputed_jump_instr(the jump target address). However, when oparg equals 1 and the instruction is followed by NOT_TAKEN, the computed jump target and the computed fallthrough target are the same address:In this minimal reproduction case:
which produces:
the address comparison
computed_jump_instr == next_instris always true regardless of which branch was actually taken, causing the assertionjump_happened == (target_instr[1].cache & 1)failed when the branch was not taken.So we should fall back to the
RECORD_BRANCH_TAKENcache bit (target_instr[1].cache & 1) to determine the branch direction, since address comparison is ambiguous.