Skip to content

Fix GH-24397: Clear vacated MERGE inputs in _zend_jit_fix_merges() #24419

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

Fix GH-24397: Clear vacated MERGE inputs in _zend_jit_fix_merges() #24419

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 @@ -3754,6 +3754,10 @@ static void _zend_jit_fix_merges(zend_jit_ctx *jit)
if (k != n) {
ir_ref n2, k2;

while (r != q) {
*r = IR_UNUSED;
r++;
}
if (k <= 1) {
insn->op = IR_BEGIN;
insn->inputs_count = 0;
Expand Down
23 changes: 23 additions & 0 deletions ext/opcache/tests/jit/gh24397.phpt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
--TEST--
GH-24397 (JIT: stale label operand on a MERGE reduced to BEGIN)
--INI--
opcache.enable=1
opcache.enable_cli=1
opcache.file_update_protection=0
opcache.jit_buffer_size=64M
opcache.jit=function
opcache.jit_debug=0x1000000
--EXTENSIONS--
opcache
--FILE--
<?php
function f() {
foreach ([1, 2] as $v) {
$c[] = $v;
}
}
f();
echo "Done\n";
?>
--EXPECTF--
%ADone
Loading