Skip to content

[pull] master from php:master #483

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 20, 2024
Merged

[pull] master from php:master #483

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
f8d2e00
Fix GH-17190: Assertion failure ext/opcache/jit/ir/ir_gcm.c (#17221)
dstogov Dec 20, 2024
ac2b656
Merge branch 'PHP-8.4'
dstogov Dec 20, 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
14 changes: 14 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 @@ -13572,6 +13572,13 @@ static int zend_jit_assign_dim_op(zend_jit_ctx *jit,

op1_addr = zend_jit_prepare_array_update(jit, opline, &op1_info, op1_addr, &if_type, &ht_ref, &may_throw);

if (Z_MODE(op3_addr) == IS_REG
&& Z_LOAD(op3_addr)
&& jit->ra[Z_SSA_VAR(op3_addr)].ref == IR_NULL) {
/* Force load */
zend_jit_use_reg(jit, op3_addr);
}

if (op1_info & MAY_BE_ARRAY) {
uint32_t var_def_info = zend_array_element_type(op1_def_info, opline->op1_type, 1, 0);

Expand Down Expand Up @@ -15210,6 +15217,13 @@ static int zend_jit_assign_obj_op(zend_jit_ctx *jit,
&& prop_type != IS_REFERENCE
&& (op1_info & (MAY_BE_ANY|MAY_BE_UNDEF)) == MAY_BE_OBJECT);

if (Z_MODE(val_addr) == IS_REG
&& Z_LOAD(val_addr)
&& jit->ra[Z_SSA_VAR(val_addr)].ref == IR_NULL) {
/* Force load */
zend_jit_use_reg(jit, val_addr);
}

if (!prop_info) {
ir_ref run_time_cache = ir_LOAD_A(jit_EX(run_time_cache));
ir_ref ref = ir_LOAD_A(ir_ADD_OFFSET(run_time_cache, (opline+1)->extended_value & ~ZEND_FETCH_OBJ_FLAGS));
Expand Down
32 changes: 32 additions & 0 deletions ext/opcache/tests/jit/gh17190.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
--TEST--
GH-17190 (Assertion failure ext/opcache/jit/ir/ir_gcm.c)
--EXTENSIONS--
opcache
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=32M
opcache.jit=function
--FILE--
<?php
$a = [2147483647,2147483647,2147483647,3,0,0,32,2147483584,127];
echo @crc32(json_encode(bitwise_small_split($a))) . "\n";

function bitwise_small_split($val) {
$split = 8;
$len = count($val);
while ($i != $len) {
if (!$overflow) {
$remaining -= $split;
$overflow = $split <= $remaining ? 0 : $split - $remaining;
} elseif (++$i != $len) {
$fusion[$i] >>= $overflow;
$remaining = 31 - $overflow;
$overflow = $split <= $remaining ? 0 : $split - $remaining;
}
}
}
?>
--EXPECT--
634125391
Loading