Skip to content

JIT: Fix OP_DATA read from an unwritten slot in zend_jit_assign_dim_op() #24451

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

Closed
waroad wants to merge 1 commit into from
Closed

JIT: Fix OP_DATA read from an unwritten slot in zend_jit_assign_dim_op() #24451

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
5 changes: 3 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 @@ -13577,9 +13577,10 @@ static int zend_jit_assign_dim_op(zend_jit_ctx *jit,
if (!zend_jit_spill_store_inv(jit, op3_addr, real_addr, op1_data_info)) {
return 0;
}
op3_addr = real_addr;
arg2 = jit_ZVAL_ADDR(jit, real_addr);
} else {
arg2 = jit_ZVAL_ADDR(jit, op3_addr);
}
arg2 = jit_ZVAL_ADDR(jit, op3_addr);
ir_CALL_3(IR_VOID, ir_CONST_FC_FUNC(zend_jit_assign_op_to_typed_ref),
reference, arg2, ir_CONST_FC_FUNC(binary_op));

Expand Down
50 changes: 50 additions & 0 deletions ext/opcache/tests/jit/gh24437.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,50 @@
--TEST--
GH-24437 (JIT: tracing JIT gives wrong sum for `$a[0] += $i + 1` on an array parameter in a loop)
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.jit=tracing
--FILE--
<?php
class C {
public int $prop = 10;
}

function f($a) {
for ($i = 0; $i < 3; $i++) {
@$a[0] += $i + 1;
}
return $a[0];
}

function g(array $a) {
for ($i = 0; $i < 3; $i++) {
$a[0] += $i + 1;
}
return $a[0];
}

function h($a) {
for ($i = 0; $i < 3; $i++) {
$a[2] %= $i + 1;
$x = $a[0] %= 1;
}
}

var_dump(f([1 => 2]));
$x = 10;
var_dump(g([&$x]), $x);
$c = new C;
var_dump(g([&$c->prop]), $c->prop);
@h([]);
?>
DONE
--EXPECT--
int(6)
int(16)
int(16)
int(16)
int(16)
DONE
Loading