From b2bc2c62faf197a027504b3fd6076cd19344b4c6 Mon Sep 17 00:00:00 2001 From: Nikita Popov Date: Fri, 28 Aug 2020 17:15:09 +0200 Subject: Remove unnecessary cache_slot arguments zend_verify_type_error_common() no longer needs the cache_slot, so drop it there and from all users. --- Zend/zend_vm_def.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'Zend/zend_vm_def.h') diff --git a/Zend/zend_vm_def.h b/Zend/zend_vm_def.h index 00bb179561..de98a3a824 100644 --- a/Zend/zend_vm_def.h +++ b/Zend/zend_vm_def.h @@ -4161,7 +4161,7 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV if (OP1_TYPE == IS_UNUSED) { SAVE_OPLINE(); - zend_verify_missing_return_type(EX(func), CACHE_ADDR(opline->op2.num)); + zend_verify_missing_return_type(EX(func)); HANDLE_EXCEPTION(); } else { /* prevents "undefined variable opline" errors */ @@ -4213,7 +4213,7 @@ ZEND_VM_COLD_CONST_HANDLER(124, ZEND_VERIFY_RETURN_TYPE, CONST|TMP|VAR|UNUSED|CV SAVE_OPLINE(); if (UNEXPECTED(!zend_check_type_slow(ret_info->type, retval_ptr, ref, cache_slot, NULL, 1, 0))) { - zend_verify_return_error(EX(func), cache_slot, retval_ptr); + zend_verify_return_error(EX(func), retval_ptr); HANDLE_EXCEPTION(); } ZEND_VM_NEXT_OPCODE(); -- cgit v1.2.1