Skip to content

Fix GH-GH-21158: Reset stackmap reg #21531

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
arnaud-lb wants to merge 1 commit into
base: PHP-8.4
Choose a base branch
from
+50 −0
Open

Fix GH-GH-21158: Reset stackmap reg #21531

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
1 change: 1 addition & 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 @@ -835,6 +835,7 @@ void *zend_jit_snapshot_handler(ir_ctx *ctx, ir_ref snapshot_ref, ir_insn *snaps
addr = (void*)zend_jit_trace_get_exit_addr(exit_point);
exit_flags &= ~ZEND_JIT_EXIT_FIXED;
}
t->stack_map[t->exit_info[exit_point].stack_offset + var].reg = ZREG_NONE;
t->stack_map[t->exit_info[exit_point].stack_offset + var].flags = ZREG_TYPE_ONLY;
}
} else if (!(exit_flags & ZEND_JIT_EXIT_FIXED)) {
Expand Down
49 changes: 49 additions & 0 deletions ext/opcache/tests/jit/gh21158.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
--TEST--
GH-21158: Assertion jit->ra[var].flags & (1<<0) failed in zend_jit_use_reg
--CREDITS--
YuanchengJiang
--EXTENSIONS--
opcache
--INI--
opcache.jit=1254
--FILE--
<?php
define('ROW', 10);
define('COL', 10);
function count_live_neighbors($board, $row, $col) {
$live_neighbors = 0;
if ($col + 1 < COL && $board[$row][$col + 1] == 1) $live_neighbors++;
if ($row - 1 >= 0 && $col - 1 >= 0 && $board[$row - 1][$col - 1] == 1) $live_neighbors++;
if ($row >= 1 && $col + 1 < COL && $board[$row - 1][$col + 1] == 1) $live_neighbors++;
return $live_neighbors;
}
$board = [
[1,1,0,0,1,1,1,1,1,0],
[0,1,0,1,1,0,0,1,0,0],
[0,1,0,0,1,0,0,0,1,0],
[0,0,1,1,1,1,1,0,0,0],
[1,1,1,1,1,1,0,1,1,0],
[0,1,0,0,1,1,1,0,1,0],
[0,1,1,0,1,1,1,1,0,0],
[1,1,0,0,0,0,1,1,1,0],
[1,0,0,1,1,0,1,1,0,1],
[0,0,1,1,1,0,1,1,0,1],
];
for ($i = 0; $i < ROW; $i++) {
for ($j = 0; $j < COL; $j++) {
echo count_live_neighbors($board, $i, $j), ",";
}
echo "\n";
}
?>
--EXPECT--
1,0,0,1,1,1,1,1,0,0,
2,1,2,2,1,2,3,2,1,1,
2,0,2,2,1,1,1,1,1,0,
1,1,2,2,1,2,0,1,0,1,
1,2,2,3,3,2,2,2,0,0,
2,2,2,3,3,2,2,2,1,1,
2,1,1,2,2,3,2,2,0,1,
2,1,1,2,1,3,3,2,1,0,
1,1,2,1,0,2,2,2,2,1,
0,2,2,2,1,3,2,1,3,0,
Loading