Skip to content

Fix GH-16996: 8.4 tracing JIT phpseclib failures #17030

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Dec 3, 2024
Merged

Fix GH-16996: 8.4 tracing JIT phpseclib failures #17030

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
2f01b79
Fix GH-16996: 8.4 tracing JIT phpseclib failures
dstogov Dec 3, 2024
d2b3af1
Fix build
dstogov Dec 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions ext/opcache/jit/zend_jit_ir.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1332,8 +1332,16 @@ static void zend_jit_def_reg(zend_jit_ctx *jit, zend_jit_addr addr, ir_ref val)
ZEND_ASSERT(jit->ra && jit->ra[var].ref == IR_NULL);

/* Negative "var" has special meaning for IR */
if (val > 0 && !zend_jit_spilling_may_cause_conflict(jit, var, val)) {
val = ir_bind(&jit->ctx, -EX_NUM_TO_VAR(jit->ssa->vars[var].var), val);
if (val > 0) {
if (jit->ctx.binding) {
ir_ref old = ir_binding_find(&jit->ctx, val);
if (old && old != -EX_NUM_TO_VAR(jit->ssa->vars[var].var)) {
val = ir_emit2(&jit->ctx, IR_OPT(IR_COPY, jit->ctx.ir_base[val].type), val, 1);
}
}
if (!zend_jit_spilling_may_cause_conflict(jit, var, val)) {
val = ir_bind(&jit->ctx, -EX_NUM_TO_VAR(jit->ssa->vars[var].var), val);
}
}
jit->ra[var].ref = val;

Expand Down
Loading