Drop unneessary if branch and adjust arg_num type

This if branch seems to be a remain of when certain type errors where E_WARNINGs, something which isn't the case since PHP 8.0.

2 files changed, 2 insertions, 8 deletions

diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index f34e1930e2..6d3c32d9b2 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -685,19 +685,13 @@ static ZEND_COLD void zend_verify_type_error_common(
 }
 
 ZEND_API ZEND_COLD void zend_verify_arg_error(
-		const zend_function *zf, const zend_arg_info *arg_info, int arg_num, zval *value)
+		const zend_function *zf, const zend_arg_info *arg_info, uint32_t arg_num, zval *value)
 {
 	zend_execute_data *ptr = EG(current_execute_data)->prev_execute_data;
 	const char *fname, *fsep, *fclass;
 	zend_string *need_msg;
 	const char *given_msg;
 
-	if (EG(exception)) {
-		/* The type verification itself might have already thrown an exception
-		 * through a promoted warning. */
-		return;
-	}
-
 	zend_verify_type_error_common(
 		zf, arg_info, value, &fname, &fsep, &fclass, &need_msg, &given_msg);
 
diff --git a/Zend/zend_execute.h b/Zend/zend_execute.h
index 3339f3992d..628b6ddec5 100644
--- a/Zend/zend_execute.h
+++ b/Zend/zend_execute.h
@@ -70,7 +70,7 @@ ZEND_API ZEND_COLD zend_result ZEND_FASTCALL zend_undefined_index_write(HashTabl
 
 ZEND_API bool zend_verify_scalar_type_hint(uint32_t type_mask, zval *arg, bool strict, bool is_internal_arg);
 ZEND_API ZEND_COLD void zend_verify_arg_error(
-		const zend_function *zf, const zend_arg_info *arg_info, int arg_num, zval *value);
+		const zend_function *zf, const zend_arg_info *arg_info, uint32_t arg_num, zval *value);
 ZEND_API ZEND_COLD void zend_verify_return_error(
 		const zend_function *zf, zval *value);
 ZEND_API bool zend_verify_ref_array_assignable(zend_reference *ref);