diff options
| author | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-28 17:15:09 +0200 |
|---|---|---|
| committer | Nikita Popov <nikita.ppv@gmail.com> | 2020-08-28 17:15:09 +0200 |
| commit | b2bc2c62faf197a027504b3fd6076cd19344b4c6 (patch) | |
| tree | 40d7070b0d319228e243e55259290d12f56de747 /Zend/zend_vm_execute.h | |
| parent | f0dfdca0ae67940ce23703a2354b4fca08e4eab8 (diff) | |
| download | php-git-b2bc2c62faf197a027504b3fd6076cd19344b4c6.tar.gz | |
Remove unnecessary cache_slot arguments
zend_verify_type_error_common() no longer needs the cache_slot,
so drop it there and from all users.
Diffstat (limited to 'Zend/zend_vm_execute.h')
| -rw-r--r-- | Zend/zend_vm_execute.h | 20 |
1 files changed, 10 insertions, 10 deletions
diff --git a/Zend/zend_vm_execute.h b/Zend/zend_vm_execute.h index e6712b86af..8cdc267369 100644 --- a/Zend/zend_vm_execute.h +++ b/Zend/zend_vm_execute.h @@ -9036,7 +9036,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYP if (IS_CONST == 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 */ @@ -9088,7 +9088,7 @@ static ZEND_VM_COLD ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYP 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(); @@ -19370,7 +19370,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UN if (IS_TMP_VAR == 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 */ @@ -19422,7 +19422,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_TMP_UN 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(); @@ -26964,7 +26964,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UN if (IS_VAR == 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 */ @@ -27016,7 +27016,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_VAR_UN 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(); @@ -34162,7 +34162,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED if (IS_UNUSED == 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 */ @@ -34214,7 +34214,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_UNUSED 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(); @@ -45836,7 +45836,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNU if (IS_CV == 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 */ @@ -45888,7 +45888,7 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL ZEND_VERIFY_RETURN_TYPE_SPEC_CV_UNU 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(); |