Skip to content

JIT: Fix zend_jit_trace_find_init_fcall_op() #23449

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: master
Choose a base branch
from
+5 −1
Open

JIT: Fix zend_jit_trace_find_init_fcall_op() #23449

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
6 changes: 5 additions & 1 deletion ext/opcache/jit/zend_jit_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1167,6 +1167,9 @@ static const zend_op *zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec *p, c
const zend_op *opline = NULL;
int call_level = 0;

/* Scan trace buffer forward to find the first recorded opline after
* the sequence of ZEND_JIT_TRACE_INIT_CALL, and keep track of the
* call level. */
p++;
while (1) {
if (p->op == ZEND_JIT_TRACE_VM) {
Expand All @@ -1178,8 +1181,9 @@ static const zend_op *zend_jit_trace_find_init_fcall_op(zend_jit_trace_rec *p, c
} else {
return NULL;
}
p--;
p++;
}
/* Scan oplines backward to find the init fcall op */
if (opline) {
while (opline > op_array->opcodes) {
opline--;
Expand Down
Loading