Repository navigation
Conversation
wilaak
force-pushed
the
fix-gh22115-jit-loop-phi-snapshot
branch
from
May 22, 2026 21:59
8346f8e to
52ab97c
Compare
Member
|
This isn't right, the root cause isn't related to loops or phi nodes. In the repro, the
zend_ssa_is_last_use() only checks the immediate next use. That use is a no-val use, so it reports op 8 as the last use and misses the RETURN. ZREG_LAST_USE gets set, zend_jit_trace_cleanup_stack() clears I think this fixes the root cause: diff --git a/ext/opcache/jit/zend_jit.c b/ext/opcache/jit/zend_jit.c
index a958a2453c4..cef21f96ea7 100644
--- a/ext/opcache/jit/zend_jit.c
+++ b/ext/opcache/jit/zend_jit.c
@@ -158,13 +158,16 @@ static bool zend_ssa_is_last_use(const zend_op_array *op_array, const zend_ssa *
}
}
+ /* A no-val use redefines the variable, so a later real use of the same SSA var is reachable on other paths. */
next_use = zend_ssa_next_use(ssa->ops, var, use);
- if (next_use < 0) {
- return 1;
- } else if (zend_ssa_is_no_val_use(op_array->opcodes + next_use, ssa->ops + next_use, var)) {
- return 1;
+ while (next_use >= 0) {
+ if (!zend_ssa_is_no_val_use(op_array->opcodes + next_use, ssa->ops + next_use, var)) {
+ return 0;
+ }
+ next_use = zend_ssa_next_use(ssa->ops, var, next_use);
}
- return 0;
+ return 1;
}
static int zend_jit_is_constant_cmp_long_long(const zend_op *opline,
Please double check this. |
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
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.
Fixes GH-22115.
Extends the existing loop-PHI pre-pass to clear ZREG_LAST_USE on every SSA version of any loop-carried CV, not just phi->sources[1]. Intermediate versions from opcodes with op1_def under RC inference (SEND_VAR, QM_ASSIGN, CAST, etc.) were keeping the flag and tripping cleanup_stack mid-loop.
Hmm why so many no-op macros lurking here? Looks like leftovers from the new 8.4 IR stuff that was added. Not touching that.
Is a quick fix, NOT AN EXPERT. Needs expertise