[php-src] master: JIT: Avoid object type check if the object is known to be a type (#24086)

Author: Nora Dossche (ndossche) Committer: GitHub (web-flow) Pusher: ndossche Date: 2026-10-08T22:53:23+02:00 Commit: https://github.com/php/php-src/commit/c79284711bd8e610fb882bfdad48584b86fcdc62 Raw diff: https://github.com/php/php-src/commit/c79284711bd8e610fb882bfdad48584b86fcdc62.diff JIT: Avoid object type check if the object is known to be a type (#24086) Changed paths: M ext/opcache/jit/zend_jit_ir.c M ext/opcache/jit/zend_jit_trace.c Diff: diff --git a/ext/opcache/jit/zend_jit_ir.c b/ext/opcache/jit/zend_jit_ir.c index 76fa8a0947f7..c0cc673d25dc 100644 --- a/ext/opcache/jit/zend_jit_ir.c +++ b/ext/opcache/jit/zend_jit_ir.c @@ -10850,7 +10850,6 @@ static int zend_jit_verify_arg_type(zend_jit_ctx *jit, const zend_op *opline, ze } if (!ZEND_ARG_SEND_MODE(arg_info) - && (type == IS_UNKNOWN || type == IS_OBJECT) && zend_jit_class_satisfies_type(known_ce, arg_info->type)) { zend_jit_known_class_type_fast_path(jit, ref, type == IS_OBJECT, known_ce, &end_inputs); } @@ -10864,7 +10863,8 @@ static int zend_jit_verify_arg_type(zend_jit_ctx *jit, const zend_op *opline, ze } } - if (type_mask != 0) { + /* A known type is not in type_mask here (see above), so the mask check would always fail */ + if (type_mask != 0 && type == IS_UNKNOWN) { if (is_power_of_two(type_mask)) { uint32_t type_code = concrete_type(type_mask); ir_ref if_ok = jit_if_Z_TYPE_ref(jit, ref, ir_CONST_U8(type_code)); diff --git a/ext/opcache/jit/zend_jit_trace.c b/ext/opcache/jit/zend_jit_trace.c index e4c59d0b8aa7..9afe1244a49d 100644 --- a/ext/opcache/jit/zend_jit_trace.c +++ b/ext/opcache/jit/zend_jit_trace.c @@ -489,10 +489,12 @@ static void zend_jit_trace_send_type(const zend_op *opline, zend_jit_trace_stack ZEND_ASSERT(arg_num <= op_array->num_args); arg_info = &op_array->arg_info[arg_num-1]; - if (ZEND_TYPE_IS_SET(arg_info->type)) { - if (!(ZEND_TYPE_FULL_MASK(arg_info->type) & (1u << type))) { - return; - } + /* Record scalars and object class types, even if there's no "object" type declaration. + * This allows RECV to record and skip object type checks. */ + if (ZEND_TYPE_IS_SET(arg_info->type) + && !(ZEND_TYPE_FULL_MASK(arg_info->type) & (1u << type)) + && !(type == IS_OBJECT && call->func->type == ZEND_USER_FUNCTION)) { + return; } } SET_STACK_TYPE(stack, EX_VAR_TO_NUM(opline->result.var), type, 1);