diff options
Diffstat (limited to 'ext/opcache/jit')
| -rw-r--r-- | ext/opcache/jit/zend_jit_disasm_x86.c | 1 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_helpers.c | 19 | ||||
| -rw-r--r-- | ext/opcache/jit/zend_jit_x86.dasc | 20 |
3 files changed, 0 insertions, 40 deletions
diff --git a/ext/opcache/jit/zend_jit_disasm_x86.c b/ext/opcache/jit/zend_jit_disasm_x86.c index 396cad432f..c7b7bf5814 100644 --- a/ext/opcache/jit/zend_jit_disasm_x86.c +++ b/ext/opcache/jit/zend_jit_disasm_x86.c @@ -433,7 +433,6 @@ static int zend_jit_disasm_init(void) REGISTER_HELPER(zend_jit_vm_stack_free_args_helper); REGISTER_HELPER(zend_jit_copy_extra_args_helper); REGISTER_HELPER(zend_jit_deprecated_or_abstract_helper); - REGISTER_HELPER(zend_jit_verify_internal_arg_types_helper); REGISTER_HELPER(zend_jit_assign_const_to_typed_ref); REGISTER_HELPER(zend_jit_assign_tmp_to_typed_ref); REGISTER_HELPER(zend_jit_assign_var_to_typed_ref); diff --git a/ext/opcache/jit/zend_jit_helpers.c b/ext/opcache/jit/zend_jit_helpers.c index 98da0523b5..cfad5786ac 100644 --- a/ext/opcache/jit/zend_jit_helpers.c +++ b/ext/opcache/jit/zend_jit_helpers.c @@ -1489,25 +1489,6 @@ static void ZEND_FASTCALL zend_jit_vm_stack_free_args_helper(zend_execute_data * zend_vm_stack_free_args(call); } -static int ZEND_FASTCALL zend_jit_verify_internal_arg_types_helper(zend_execute_data *call) -{ - zend_function *fbc = call->func; - uint32_t i; - uint32_t num_args = ZEND_CALL_NUM_ARGS(call); - zval *p = ZEND_CALL_ARG(call, 1); - - for (i = 0; i < num_args; ++i) { - zend_check_internal_arg_type(fbc, i + 1, p); - if (UNEXPECTED(EG(exception))) { - EG(current_execute_data) = call->prev_execute_data; - zend_vm_stack_free_args(call); - return 0; - } - p++; - } - return 1; -} - static zend_always_inline void zend_jit_assign_to_typed_ref(zend_reference *ref, zval *value, zend_uchar value_type) { zval variable; diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc index 4501edbc7a..5023db62da 100644 --- a/ext/opcache/jit/zend_jit_x86.dasc +++ b/ext/opcache/jit/zend_jit_x86.dasc @@ -7680,26 +7680,6 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, zend_op_ar | // EG(current_execute_data) = execute_data; | MEM_OP2_1_ZTS mov, aword, executor_globals, current_execute_data, RX, r1 - if (!func || (func->common.fn_flags & ZEND_ACC_HAS_TYPE_HINTS)) { - if (!func) { - | test dword [r0 + offsetof(zend_op_array, fn_flags)], ZEND_ACC_HAS_TYPE_HINTS - | jnz >1 - |.cold_code - } - |1: - | mov FCARG1a, RX - | EXT_CALL zend_jit_verify_internal_arg_types_helper, r0 - | test r0, r0 - | je >8 - | LOAD_ZVAL_ADDR FCARG2a, res_addr // reload - if (!func) { - | mov r0, EX:RX->func // reload - | jmp >1 - |.code - } - |1: - } - zend_jit_reset_opline(Dst, NULL); | // fbc->internal_function.handler(call, ret); |
