Skip to content

Fix GH-24471: Tracing JIT reads stale float temporary on side exit #24484

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

Open
jorgsowa wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+53 −0
Open

Fix GH-24471: Tracing JIT reads stale float temporary on side exit #24484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 4 additions & 0 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 @@ -294,6 +294,7 @@ typedef struct _zend_jit_ctx {
ir_ref *bb_edges;
zend_jit_trace_info *trace;
zend_jit_reg_var *ra;
ir_ref op_start_ref;
int delay_var;
ir_refs *delay_refs;
ir_ref eg_exception_addr;
Expand Down Expand Up @@ -1352,6 +1353,8 @@ static bool zend_jit_spilling_may_cause_conflict(zend_jit_ctx *jit, int var, ir_
&& jit->ra[jit->ssa->ops[jit->ssa->vars[var].definition].op2_use].ref == val) {
/* Avoid spill conflict between of ASSIGN.op1_def and ASSIGN.op1_use */
return 1;
} else if (val < jit->op_start_ref) {
return 1;
}
return 0;
}
Expand Down Expand Up @@ -2811,6 +2814,7 @@ static void zend_jit_init_ctx(zend_jit_ctx *jit, uint32_t flags)
jit->bb_edges = NULL;
jit->trace = NULL;
jit->ra = NULL;
jit->op_start_ref = IR_UNUSED;
jit->delay_var = -1;
jit->delay_refs = NULL;
jit->eg_exception_addr = 0;
Expand Down
1 change: 1 addition & 0 deletions ext/opcache/jit/zend_jit_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4387,6 +4387,7 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
bool gen_handler = false;

opline = p->opline;
jit->op_start_ref = jit->ctx.insns_count;
if (op1_type & (IS_TRACE_REFERENCE|IS_TRACE_INDIRECT)) {
op1_type = IS_UNKNOWN;
}
Expand Down
24 changes: 24 additions & 0 deletions ext/opcache/tests/jit/gh24471.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
GH-24471 (Tracing JIT: float temporary marked type_only in trace exit, VM reads stale value)
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.jit=tracing
opcache.file_update_protection=0
--FILE--
<?php
function f($x, $y) {
$d = ($x + 0.5) * ($y === [1] ? 2.0 : 1.0);
return $d;
}
$ys = array_fill(0, 100, [0]);
$ys[] = [1];
foreach ($ys as $i => $y) {
$r = f($i, $y);
}
var_dump($r);
?>
--EXPECT--
float(201)
24 changes: 24 additions & 0 deletions ext/opcache/tests/jit/gh24471_2.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,24 @@
--TEST--
GH-24471 (Tracing JIT: CSE'd float temporary marked type_only in trace exit)
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.jit=tracing
opcache.file_update_protection=0
--FILE--
<?php
function f($x, $y) {
$r = ($x + 0.5) + ($d = $x + 0.5) * ($y === [1] ? 2.0 : 3.0);
return $r + $d;
}
$ys = array_fill(0, 100, [0]);
$ys[] = [1];
foreach ($ys as $i => $y) {
$r = f($i, $y);
}
var_dump($r);
?>
--EXPECT--
float(402)
Loading