Skip to content

Guard JIT blacklist rewrite to tracing JIT metadata #3929

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
bwoebi merged 1 commit into from
May 28, 2026
Merged

Guard JIT blacklist rewrite to tracing JIT metadata #3929

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
12 changes: 10 additions & 2 deletions zend_abstract_interface/jit_utils/jit_blacklist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -94,6 +94,10 @@ typedef union _zend_op_trace_info {
#define ZEND_FUNC_INFO(op_array) \
((zend_func_info*)((op_array)->reserved[zend_func_info_rid]))

#if !defined(ZEND_FUNC_JIT_ON_HOT_TRACE)
#define ZEND_FUNC_JIT_ON_HOT_TRACE (1u << 16)
#endif

static void *opcache_handle;
static void zai_jit_find_opcache_handle(void *ext) {
zend_extension *extension = (zend_extension *)ext;
Expand Down Expand Up @@ -168,7 +172,7 @@ int zai_get_zend_func_rid(zend_op_array *op_array) {
}

for (int i = 0; i < ZEND_MAX_RESERVED_RESOURCES; ++i) {
if (check_pointer_near(op_array->reserved, op_array->arg_info)) {
if (check_pointer_near(op_array->reserved[i], op_array->arg_info)) {
return (zend_func_info_rid = i);
}
}
Expand All @@ -192,7 +196,11 @@ void zai_jit_blacklist_function_inlining(zend_op_array *op_array) {
// now in PHP < 8.1, zend_func_info_rid is set (on newer versions it's in zend_func_info.h)

zend_jit_op_array_trace_extension *jit_extension = (zend_jit_op_array_trace_extension *)ZEND_FUNC_INFO(op_array);
if (!jit_extension) {
if (!jit_extension || !zai_is_mapped(jit_extension, sizeof(*jit_extension))) {
return;
}

if (!(jit_extension->func_info.flags & ZEND_FUNC_JIT_ON_HOT_TRACE)) {
return;
}

Expand Down
Loading