Skip to content

Fix GH-24445: Tracing JIT loses register-allocated CVs i… #24995

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
devnexen wants to merge 1 commit into
base: master
Choose a base branch
from
+78 −0
Open

Fix GH-24445: Tracing JIT loses register-allocated CVs i… #24995

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
9 changes: 9 additions & 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 @@ -3266,6 +3266,15 @@ static zend_jit_reg_var* zend_jit_trace_allocate_registers(zend_jit_trace_rec *t
}

if (count) {
for (i = 0; i < ssa->vars_count; i++) {
if (RA_HAS_REG(i) &&
vars_op_array[i] &&
vars_op_array[i]->last_try_catch &&
ssa->vars[i].var < vars_op_array[i]->last_var &&
!(RA_REG_FLAGS(i) & ZREG_LOAD)) {
RA_REG_FLAGS(i) |= ZREG_STORE;
}
}
/* SSA resolution */
if (trace_buffer->stop == ZEND_JIT_TRACE_STOP_LOOP
|| trace_buffer->stop == ZEND_JIT_TRACE_STOP_RECURSIVE_CALL
Expand Down
36 changes: 36 additions & 0 deletions ext/opcache/tests/jit/gh24445.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
--TEST--
GH-24445 (Tracing JIT: a catch reads an int local as undefined after an internal call throws)
--CREDITS--
EJ-Research
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=64M
opcache.jit=tracing
opcache.jit_hot_loop=1
opcache.jit_hot_func=1
--FILE--
<?php
function loop(array $p): void { foreach ($p as $v) {} }
function id(int $n): int { return $n; }
function run(array $p, int $d): int {
loop($p);
$n = count($p);
try {
intdiv(1, $d);
} catch (DivisionByZeroError $e) {
var_dump($n);
return -1;
}
return id($n);
}
for ($i = 0; $i < 10; $i++) {
run([1], 1);
}
run([1], 0);
?>
--EXPECT--
int(1)
33 changes: 33 additions & 0 deletions ext/opcache/tests/jit/gh24798.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
--TEST--
GH-24798 (Tracing JIT loses register-allocated CVs when an exception is caught in the same function)
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=64M
opcache.jit=tracing
opcache.jit_hot_loop=1
opcache.jit_hot_func=1
opcache.jit_hot_return=1
opcache.jit_hot_side_exit=1
--FILE--
<?php
function f($n) {
$s = 0.0;
for ($i = 0; $i < $n; $i++) {
try {
$s += 1.0 / ($i - 2);
} catch (DivisionByZeroError $e) {
echo $e::class, ': ', $e->getMessage(), ' at $i = ', $i, PHP_EOL;
$s += 100;
}
}
return $s;
}
var_dump(f(5));
?>
--EXPECT--
DivisionByZeroError: Division by zero at $i = 2
float(100)
Loading