Skip to content

JIT: Avoid object type check if the object is known to be a type #24086

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
ndossche wants to merge 1 commit into
base: master
Choose a base branch
from
+8 −6
Open

JIT: Avoid object type check if the object is known to be a type #24086

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: 2 additions & 2 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 @@ -10831,7 +10831,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);
}
Expand All @@ -10845,7 +10844,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));
Expand Down
10 changes: 6 additions & 4 deletions ext/opcache/jit/zend_jit_trace.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -481,10 +481,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);
Expand Down
Loading