From b2a7ca4f1f778c0beb3435ebe2db1b891c35743a Mon Sep 17 00:00:00 2001 From: Gina Peter Banyard Date: Wed, 5 Aug 2026 00:46:35 +0100 Subject: [PATCH] Zend: refactor fast ZPP to only use zend_expected_type Removing the usage of zpp_error and allowing 'slow' ZPP to reuse the error logic --- Zend/zend_API.c | 82 +++++++++---------------------------- Zend/zend_API.h | 87 +++++++++++----------------------------- ext/bcmath/bcmath.c | 2 +- ext/date/time_duration.c | 2 +- ext/gd/gd.c | 2 +- ext/gmp/gmp.c | 2 +- main/php_streams.h | 3 +- 7 files changed, 49 insertions(+), 131 deletions(-) diff --git a/Zend/zend_API.c b/Zend/zend_API.c index c9f5ed38aee5..ee0111c2f839 100644 --- a/Zend/zend_API.c +++ b/Zend/zend_API.c @@ -227,7 +227,6 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(uint32_t n { static const char * const expected_error[] = { Z_EXPECTED_TYPES(Z_EXPECTED_TYPE_STR) - NULL }; if (EG(exception)) { @@ -360,49 +359,49 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_callback_or_null_error(uint32_t } /* }}} */ -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(zpp_error error_code, uint32_t num, char *name, zend_expected_type expected_type, const zval *arg) /* {{{ */ +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(uint32_t num, char *name, zend_expected_type expected_type, const zval *arg) /* {{{ */ { - switch (error_code) { - case ZPP_ERROR_WRONG_CALLBACK: + switch (expected_type) { + case Z_EXPECTED_FUNC: zend_wrong_callback_error(num, name); break; - case ZPP_ERROR_WRONG_CALLBACK_OR_NULL: + case Z_EXPECTED_FUNC_OR_NULL: zend_wrong_callback_or_null_error(num, name); break; - case ZPP_ERROR_WRONG_CLASS_NAME: + case Z_EXPECTED_CLASS_NAME: zend_wrong_class_name_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS_NAME_OR_NULL: + case Z_EXPECTED_CLASS_NAME_OR_NULL: zend_wrong_class_name_or_null_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS: + case Z_EXPECTED_CLASS: zend_wrong_parameter_class_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS_OR_NULL: + case Z_EXPECTED_CLASS_OR_NULL: zend_wrong_parameter_class_or_null_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS_OR_STRING: + case Z_EXPECTED_CLASS_OR_STRING: zend_wrong_parameter_class_or_string_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS_OR_STRING_OR_NULL: + case Z_EXPECTED_CLASS_OR_STRING_OR_NULL: zend_wrong_parameter_class_or_string_or_null_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS_OR_LONG: + case Z_EXPECTED_CLASS_OR_LONG: zend_wrong_parameter_class_or_long_error(num, name, arg); break; - case ZPP_ERROR_WRONG_CLASS_OR_LONG_OR_NULL: + case Z_EXPECTED_CLASS_OR_LONG_OR_NULL: zend_wrong_parameter_class_or_long_or_null_error(num, name, arg); break; - case ZPP_ERROR_WRONG_ARG: + default: zend_wrong_parameter_type_error(num, expected_type, arg); break; - case ZPP_ERROR_UNEXPECTED_EXTRA_NAMED: + case Z_EXPECTED_NO_EXTRA_NAMED: zend_unexpected_extra_named_error(); break; - case ZPP_ERROR_FAILURE: + case Z_EXPECTED_FAILURE: ZEND_ASSERT(EG(exception) && "Should have produced an error already"); break; - case ZPP_ERROR_OK: + case Z_EXPECTED_OK: ZEND_UNREACHABLE(); } } @@ -1036,7 +1035,7 @@ static zend_expected_type zend_parse_arg_impl(zval *arg, va_list *va, const char if (ce) { *error = ZSTR_VAL(ce->name); } - return check_null ? Z_EXPECTED_OBJECT_OR_NULL : Z_EXPECTED_OBJECT; + return check_null ? Z_EXPECTED_CLASS_OR_NULL : Z_EXPECTED_CLASS; } } break; @@ -1083,7 +1082,7 @@ static zend_expected_type zend_parse_arg_impl(zval *arg, va_list *va, const char *spec = spec_walk; - return Z_EXPECTED_LAST; + return Z_EXPECTED_OK; } /* }}} */ @@ -1092,7 +1091,7 @@ static zend_result zend_parse_arg(uint32_t arg_num, zval *arg, va_list *va, cons char *error = NULL; zend_expected_type expected_type = zend_parse_arg_impl(arg, va, spec, &error, arg_num); - if (expected_type != Z_EXPECTED_LAST) { + if (expected_type != Z_EXPECTED_OK) { if (EG(exception)) { if (error && (expected_type == Z_EXPECTED_FUNC || expected_type == Z_EXPECTED_FUNC_OR_NULL)) { efree(error); @@ -1101,48 +1100,7 @@ static zend_result zend_parse_arg(uint32_t arg_num, zval *arg, va_list *va, cons } if (!(flags & ZEND_PARSE_PARAMS_QUIET)) { - /* More complex error, can only happen for: - * Objects of a specific class - * Z_EXPECTED_OBJECT - * Z_EXPECTED_OBJECT_OR_NULL - * Class names - * Z_EXPECTED_CLASS_NAME - * Z_EXPECTED_CLASS_NAME_OR_NULL - * Functions - * Z_EXPECTED_FUNC - * Z_EXPECTED_FUNC_OR_NULL - */ - if (error) { - switch (expected_type) { - case Z_EXPECTED_OBJECT: - /* DO NOT FREE error: it's a pointer to ZSTR_VAL(ce->name) */ - zend_wrong_parameter_class_error(arg_num, error, arg); - break; - case Z_EXPECTED_OBJECT_OR_NULL: - /* DO NOT FREE error: it's a pointer to ZSTR_VAL(ce->name) */ - zend_wrong_parameter_class_or_null_error(arg_num, error, arg); - break; - case Z_EXPECTED_FUNC: - /* error is freed by zend_wrong_callback_error() */ - zend_wrong_callback_error(arg_num, error); - break; - case Z_EXPECTED_FUNC_OR_NULL: - /* error is freed by zend_wrong_callback_or_null_error() */ - zend_wrong_callback_or_null_error(arg_num, error); - break; - case Z_EXPECTED_CLASS_NAME: - /* DO NOT FREE error: it's a pointer to ZSTR_VAL(ce->name) */ - zend_wrong_class_name_error(arg_num, error, arg); - break; - case Z_EXPECTED_CLASS_NAME_OR_NULL: - /* DO NOT FREE error: it's a pointer to ZSTR_VAL(ce->name) */ - zend_wrong_class_name_or_null_error(arg_num, error, arg); - break; - default: - ZEND_UNREACHABLE(); - } - } - zend_wrong_parameter_type_error(arg_num, expected_type, arg); + zend_wrong_parameter_error(arg_num, error, expected_type, arg); } else if (error /* Only free error if it's a callable expected type, as otherwise it's a pointer to ZSTR_VAL(ce->name) */ && (expected_type == Z_EXPECTED_FUNC || expected_type == Z_EXPECTED_FUNC_OR_NULL)) { diff --git a/Zend/zend_API.h b/Zend/zend_API.h index d1064970dcd5..6fefb349eae3 100644 --- a/Zend/zend_API.h +++ b/Zend/zend_API.h @@ -1605,8 +1605,6 @@ static zend_always_inline zval *zend_try_array_init(zval *zv) _(Z_EXPECTED_ARRAY_OR_LONG_OR_NULL, "of type array|int|null") \ _(Z_EXPECTED_ITERABLE, "of type Traversable|array") \ _(Z_EXPECTED_ITERABLE_OR_NULL, "of type Traversable|array|null") \ - _(Z_EXPECTED_FUNC, "a valid callback") \ - _(Z_EXPECTED_FUNC_OR_NULL, "a valid callback or null") \ _(Z_EXPECTED_RESOURCE, "of type resource") \ _(Z_EXPECTED_RESOURCE_OR_NULL, "of type resource or null") \ _(Z_EXPECTED_PATH, "of type string") \ @@ -1637,29 +1635,23 @@ static zend_always_inline zval *zend_try_array_init(zval *zv) typedef enum _zend_expected_type { Z_EXPECTED_TYPES(Z_EXPECTED_TYPE_ENUM) - Z_EXPECTED_LAST + Z_EXPECTED_FUNC, + Z_EXPECTED_FUNC_OR_NULL, + Z_EXPECTED_CLASS, + Z_EXPECTED_CLASS_OR_NULL, + Z_EXPECTED_CLASS_OR_STRING, + Z_EXPECTED_CLASS_OR_STRING_OR_NULL, + Z_EXPECTED_CLASS_OR_LONG, + Z_EXPECTED_CLASS_OR_LONG_OR_NULL, + Z_EXPECTED_NO_EXTRA_NAMED, + /* For custom ZPP specifier which already throw an exception */ + Z_EXPECTED_FAILURE, + Z_EXPECTED_OK, } zend_expected_type; -C23_ENUM(zpp_error, uint8_t) { - ZPP_ERROR_OK, - ZPP_ERROR_FAILURE, - ZPP_ERROR_WRONG_CALLBACK, - ZPP_ERROR_WRONG_CALLBACK_OR_NULL, - ZPP_ERROR_WRONG_CLASS_NAME, - ZPP_ERROR_WRONG_CLASS_NAME_OR_NULL, - ZPP_ERROR_WRONG_CLASS, - ZPP_ERROR_WRONG_CLASS_OR_NULL, - ZPP_ERROR_WRONG_CLASS_OR_STRING, - ZPP_ERROR_WRONG_CLASS_OR_STRING_OR_NULL, - ZPP_ERROR_WRONG_CLASS_OR_LONG, - ZPP_ERROR_WRONG_CLASS_OR_LONG_OR_NULL, - ZPP_ERROR_WRONG_ARG, - ZPP_ERROR_UNEXPECTED_EXTRA_NAMED, -}; - ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_none_error(void); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameters_count_error(uint32_t min_num_args, uint32_t max_num_args); -ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(zpp_error error_code, uint32_t num, char *name, zend_expected_type expected_type, const zval *arg); +ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_error(uint32_t num, char *name, zend_expected_type expected_type, const zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_type_error(uint32_t num, zend_expected_type expected_type, const zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_error(uint32_t num, const char *name, const zval *arg); ZEND_API ZEND_COLD void ZEND_FASTCALL zend_wrong_parameter_class_or_null_error(uint32_t num, const char *name, const zval *arg); @@ -1688,11 +1680,10 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string uint32_t _num_args = EX_NUM_ARGS(); \ uint32_t _i = 0; \ zval *_real_arg, *_arg = NULL; \ - zend_expected_type _expected_type = Z_EXPECTED_LONG; \ + zend_expected_type _expected_type = Z_EXPECTED_OK; \ char *_error = NULL; \ bool _dummy = 0; \ bool _optional = 0; \ - zpp_error _error_code = ZPP_ERROR_OK; \ ((void)_i); \ ((void)_real_arg); \ ((void)_arg); \ @@ -1707,7 +1698,7 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \ zend_wrong_parameters_count_error(_min_num_args, _max_num_args); \ } \ - _error_code = ZPP_ERROR_FAILURE; \ + _expected_type = Z_EXPECTED_FAILURE; \ break; \ } \ _real_arg = ZEND_CALL_ARG(execute_data, 0); @@ -1725,9 +1716,9 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string #define ZEND_PARSE_PARAMETERS_END_EX(failure) \ ZEND_ASSERT(_i == _max_num_args || _max_num_args == (uint32_t) -1); \ } while (0); \ - if (UNEXPECTED(_error_code != ZPP_ERROR_OK)) { \ + if (UNEXPECTED(_expected_type != Z_EXPECTED_OK)) { \ if (!(_flags & ZEND_PARSE_PARAMS_QUIET)) { \ - zend_wrong_parameter_error(_error_code, _i, _error, _expected_type, _arg); \ + zend_wrong_parameter_error(_i, _error, _expected_type, _arg); \ } \ failure; \ } \ @@ -1763,7 +1754,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, separate); \ if (UNEXPECTED(!zend_parse_arg_array(_arg, &dest, check_null, 0))) { \ _expected_type = check_null ? Z_EXPECTED_ARRAY_OR_NULL : Z_EXPECTED_ARRAY; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1781,7 +1771,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, separate); \ if (UNEXPECTED(!zend_parse_arg_array(_arg, &dest, check_null, 1))) { \ _expected_type = check_null ? Z_EXPECTED_ARRAY_OR_NULL : Z_EXPECTED_ARRAY; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1795,7 +1784,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_iterable(_arg, &dest, check_null))) { \ _expected_type = check_null ? Z_EXPECTED_ITERABLE_OR_NULL : Z_EXPECTED_ITERABLE; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1810,7 +1798,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_bool(_arg, &dest, &is_null, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_BOOL_OR_NULL : Z_EXPECTED_BOOL; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1827,7 +1814,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string if (UNEXPECTED(!zend_parse_arg_class(_arg, &dest, _base_ce, _i, check_null))) { \ _error = _base_ce ? ZSTR_VAL((_base_ce)->name) : NULL; \ _expected_type = check_null ? Z_EXPECTED_CLASS_NAME_OR_NULL : Z_EXPECTED_CLASS_NAME; \ - _error_code = check_null ? ZPP_ERROR_WRONG_CLASS_NAME_OR_NULL : ZPP_ERROR_WRONG_CLASS_NAME; \ break; \ } @@ -1841,7 +1827,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_obj_or_class_name(_arg, &dest, allow_null))) { \ _expected_type = allow_null ? Z_EXPECTED_OBJECT_OR_CLASS_NAME_OR_NULL : Z_EXPECTED_OBJECT_OR_CLASS_NAME; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1855,7 +1840,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_obj_or_str(_arg, &destination_object, NULL, &destination_string, allow_null, _i))) { \ _expected_type = allow_null ? Z_EXPECTED_OBJECT_OR_STRING_OR_NULL : Z_EXPECTED_OBJECT_OR_STRING; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1870,11 +1854,10 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string if (UNEXPECTED(!zend_parse_arg_obj_or_str(_arg, &destination_object, base_ce, &destination_string, allow_null, _i))) { \ if (base_ce) { \ _error = ZSTR_VAL((base_ce)->name); \ - _error_code = allow_null ? ZPP_ERROR_WRONG_CLASS_OR_STRING_OR_NULL : ZPP_ERROR_WRONG_CLASS_OR_STRING; \ + _expected_type = allow_null ? Z_EXPECTED_CLASS_OR_STRING_OR_NULL : Z_EXPECTED_CLASS_OR_STRING; \ break; \ } else { \ _expected_type = allow_null ? Z_EXPECTED_OBJECT_OR_STRING_OR_NULL : Z_EXPECTED_OBJECT_OR_STRING; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } \ } @@ -1890,7 +1873,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_double(_arg, &dest, &is_null, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_DOUBLE_OR_NULL : Z_EXPECTED_DOUBLE; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1904,12 +1886,8 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string #define Z_PARAM_FUNC_EX2(dest_fci, dest_fcc, check_null, deref, free_trampoline) \ Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_func(_arg, &dest_fci, &dest_fcc, check_null, &_error, free_trampoline))) { \ - if (!_error) { \ - _expected_type = check_null ? Z_EXPECTED_FUNC_OR_NULL : Z_EXPECTED_FUNC; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ - } else { \ - _error_code = check_null ? ZPP_ERROR_WRONG_CALLBACK_OR_NULL : ZPP_ERROR_WRONG_CALLBACK; \ - } \ + ZEND_ASSERT(_error); \ + _expected_type = check_null ? Z_EXPECTED_FUNC_OR_NULL : Z_EXPECTED_FUNC; \ break; \ } \ @@ -1932,7 +1910,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, separate); \ if (UNEXPECTED(!zend_parse_arg_array_ht(_arg, &dest, check_null, 0, separate))) { \ _expected_type = check_null ? Z_EXPECTED_ARRAY_OR_NULL : Z_EXPECTED_ARRAY; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1949,7 +1926,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_array_ht_or_long(_arg, &dest_ht, &dest_long, &is_null, allow_null, _i))) { \ _expected_type = allow_null ? Z_EXPECTED_ARRAY_OR_LONG_OR_NULL : Z_EXPECTED_ARRAY_OR_LONG; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1964,7 +1940,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, separate); \ if (UNEXPECTED(!zend_parse_arg_array_ht(_arg, &dest, check_null, 1, separate))) { \ _expected_type = check_null ? Z_EXPECTED_ARRAY_OR_NULL : Z_EXPECTED_ARRAY; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1979,7 +1954,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_long(_arg, &dest, &is_null, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_LONG_OR_NULL : Z_EXPECTED_LONG; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -1994,7 +1968,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_number(_arg, &dest, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_NUMBER_OR_NULL : Z_EXPECTED_NUMBER; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2008,7 +1981,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_number_or_str(_arg, &dest, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_NUMBER_OR_STRING_OR_NULL : Z_EXPECTED_NUMBER_OR_STRING; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2023,7 +1995,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_object(_arg, &dest, NULL, check_null))) { \ _expected_type = check_null ? Z_EXPECTED_OBJECT_OR_NULL : Z_EXPECTED_OBJECT; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2038,7 +2009,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_obj(_arg, &dest, NULL, check_null))) { \ _expected_type = check_null ? Z_EXPECTED_OBJECT_OR_NULL : Z_EXPECTED_OBJECT; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2054,11 +2024,10 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string if (UNEXPECTED(!zend_parse_arg_object(_arg, &dest, _ce, check_null))) { \ if (_ce) { \ _error = ZSTR_VAL((_ce)->name); \ - _error_code = check_null ? ZPP_ERROR_WRONG_CLASS_OR_NULL : ZPP_ERROR_WRONG_CLASS; \ + _expected_type = check_null ? Z_EXPECTED_CLASS_OR_NULL : Z_EXPECTED_CLASS; \ break; \ } else { \ _expected_type = check_null ? Z_EXPECTED_OBJECT_OR_NULL : Z_EXPECTED_OBJECT; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } \ } @@ -2075,11 +2044,10 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string if (UNEXPECTED(!zend_parse_arg_obj(_arg, &dest, _ce, check_null))) { \ if (_ce) { \ _error = ZSTR_VAL((_ce)->name); \ - _error_code = check_null ? ZPP_ERROR_WRONG_CLASS_OR_NULL : ZPP_ERROR_WRONG_CLASS; \ + _expected_type = check_null ? Z_EXPECTED_CLASS_OR_NULL : Z_EXPECTED_CLASS; \ break; \ } else { \ _expected_type = check_null ? Z_EXPECTED_OBJECT_OR_NULL : Z_EXPECTED_OBJECT; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } \ } @@ -2094,7 +2062,7 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_obj_or_long(_arg, &dest_obj, _ce, &dest_long, &is_null, allow_null, _i))) { \ _error = ZSTR_VAL((_ce)->name); \ - _error_code = allow_null ? ZPP_ERROR_WRONG_CLASS_OR_LONG_OR_NULL : ZPP_ERROR_WRONG_CLASS_OR_LONG; \ + _expected_type = allow_null ? Z_EXPECTED_CLASS_OR_LONG_OR_NULL : Z_EXPECTED_CLASS_OR_LONG; \ break; \ } @@ -2116,7 +2084,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_path(_arg, &dest, &dest_len, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_PATH_OR_NULL : Z_EXPECTED_PATH; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2131,7 +2098,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_path_str(_arg, &dest, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_PATH_OR_NULL : Z_EXPECTED_PATH; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2146,7 +2112,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_resource(_arg, &dest, check_null))) { \ _expected_type = check_null ? Z_EXPECTED_RESOURCE_OR_NULL : Z_EXPECTED_RESOURCE; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2161,7 +2126,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_string(_arg, &dest, &dest_len, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_STRING_OR_NULL : Z_EXPECTED_STRING; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2176,7 +2140,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(deref, 0); \ if (UNEXPECTED(!zend_parse_arg_str(_arg, &dest, check_null, _i))) { \ _expected_type = check_null ? Z_EXPECTED_STRING_OR_NULL : Z_EXPECTED_STRING; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2213,7 +2176,7 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string dest_num = 0; \ } \ if (UNEXPECTED(ZEND_CALL_INFO(execute_data) & ZEND_CALL_HAS_EXTRA_NAMED_PARAMS)) { \ - _error_code = ZPP_ERROR_UNEXPECTED_EXTRA_NAMED; \ + _expected_type = Z_EXPECTED_NO_EXTRA_NAMED; \ break; \ } \ } while (0); @@ -2241,7 +2204,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_array_ht_or_str(_arg, &dest_ht, &dest_str, allow_null, _i))) { \ _expected_type = allow_null ? Z_EXPECTED_ARRAY_OR_STRING_OR_NULL : Z_EXPECTED_ARRAY_OR_STRING; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } @@ -2255,7 +2217,6 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!zend_parse_arg_str_or_long(_arg, &dest_str, &dest_long, &is_null, allow_null, _i))) { \ _expected_type = allow_null ? Z_EXPECTED_STRING_OR_LONG_OR_NULL : Z_EXPECTED_STRING_OR_LONG; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ break; \ } diff --git a/ext/bcmath/bcmath.c b/ext/bcmath/bcmath.c index a7f8bc143a48..3b718df1ffb9 100644 --- a/ext/bcmath/bcmath.c +++ b/ext/bcmath/bcmath.c @@ -1408,7 +1408,7 @@ static int bcmath_number_compare(zval *op1, zval *op2) zend_parse_arg_str_or_long(_arg, &(dest_str), &(dest_long), &_dummy, 0, _i)))) { \ zend_argument_type_error(_i, "must be of type int, string, or %pS, %s given", \ bcmath_number_ce->name, zend_zval_value_name(_arg)); \ - _error_code = ZPP_ERROR_FAILURE; \ + _expected_type = Z_EXPECTED_FAILURE; \ break; \ } diff --git a/ext/date/time_duration.c b/ext/date/time_duration.c index 674c17cd0acb..04f21beb1f18 100644 --- a/ext/date/time_duration.c +++ b/ext/date/time_duration.c @@ -34,7 +34,7 @@ static_assert(NANOS_IN_MILLI * MILLIS_IN_SEC == NANOS_IN_SEC, ""); Z_PARAM_LONG(__##l); \ if (__##l < 0) { \ zend_argument_value_error(_i, "must be greater than or equal to 0"); \ - _error_code = ZPP_ERROR_FAILURE; \ + _expected_type = Z_EXPECTED_FAILURE; \ break; \ } \ l = __##l; \ diff --git a/ext/gd/gd.c b/ext/gd/gd.c index 2d3191cf62dd..6b9fd5c913c6 100644 --- a/ext/gd/gd.c +++ b/ext/gd/gd.c @@ -4218,7 +4218,7 @@ PHP_FUNCTION(imageaffine) dest_ht = NULL; \ if (UNEXPECTED(!zend_parse_arg_double(_arg, &dest_double, NULL, false, _i))) { \ zend_argument_type_error(_i, "must be of type array|float, %s given", zend_zval_value_name(_arg)); \ - _error_code = ZPP_ERROR_FAILURE; \ + _expected_type = Z_EXPECTED_FAILURE; \ break; \ } \ } diff --git a/ext/gmp/gmp.c b/ext/gmp/gmp.c index 4a81026d451b..0ee8ff699820 100644 --- a/ext/gmp/gmp.c +++ b/ext/gmp/gmp.c @@ -159,7 +159,7 @@ static bool gmp_zend_parse_arg_into_mpz(zval *arg, mpz_ptr *destination_mpz_ptr, #define GMP_Z_PARAM_INTO_MPZ_PTR(destination_mpz_ptr) \ Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!gmp_zend_parse_arg_into_mpz(_arg, &destination_mpz_ptr, _i))) { \ - _error_code = ZPP_ERROR_FAILURE; \ + _expected_type = Z_EXPECTED_FAILURE; \ if (!EG(exception)) { \ zend_argument_type_error(_i, "must be of type GMP|string|int, %s given", zend_zval_value_name(_arg)); \ } \ diff --git a/main/php_streams.h b/main/php_streams.h index a697dff65254..dcfb3dcede55 100644 --- a/main/php_streams.h +++ b/main/php_streams.h @@ -329,10 +329,9 @@ static zend_always_inline bool php_stream_zend_parse_arg_into_stream( #define PHP_Z_PARAM_STREAM_EX(destination_stream_ptr, check_null) \ Z_PARAM_PROLOGUE(0, 0); \ if (UNEXPECTED(!php_stream_zend_parse_arg_into_stream(_arg, &destination_stream_ptr, check_null, _i))) { \ - _error_code = ZPP_ERROR_FAILURE; \ + _expected_type = Z_EXPECTED_FAILURE; \ if (!EG(exception)) { \ _expected_type = check_null ? Z_EXPECTED_RESOURCE_OR_NULL : Z_EXPECTED_RESOURCE; \ - _error_code = ZPP_ERROR_WRONG_ARG; \ } \ break; \ }