Skip to content

Zend: refactor type checking and unify const, prop, arg, and return values #21580

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
Girgias wants to merge 8 commits into
base: master
Choose a base branch
from
+394 −460
Draft

Zend: refactor type checking and unify const, prop, arg, and return values #21580

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
b0d20f1
Zend: unify type checking for class constants, properties, arguments,…
Girgias Mar 27, 2026
613f145
Condence weak mode type checks may coerce
Girgias Mar 30, 2026
e6335f8
Re-inline the logic for checking a class name in zend_check_type_slow
Girgias Mar 31, 2026
1700561
Pass a coercible zval* to do the coercion during the type check if re…
Girgias Mar 30, 2026
b84bdd4
minor faffing about
Girgias Mar 31, 2026
b74504e
Create a dedicated function for type checking return types
Girgias Apr 27, 2026
a10a5b1
fix GCC release builds?
Girgias May 4, 2026
314eb09
Delay computation of scope
Girgias May 4, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 2 additions & 10 deletions Zend/zend_API.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,11 +549,7 @@ ZEND_API bool ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, zend_long
} else {
zend_long lval = zend_dval_to_lval(Z_DVAL_P(arg));
if (UNEXPECTED(!zend_is_long_compatible(Z_DVAL_P(arg), lval))) {
/* Check arg_num is not (uint32_t)-1, as otherwise its called by
* zend_verify_weak_scalar_type_hint_no_sideeffect() */
if (arg_num != (uint32_t)-1) {
zend_incompatible_double_to_long_error(Z_DVAL_P(arg));
}
zend_incompatible_double_to_long_error(Z_DVAL_P(arg));
if (UNEXPECTED(EG(exception))) {
return 0;
}
Expand All @@ -577,11 +573,7 @@ ZEND_API bool ZEND_FASTCALL zend_parse_arg_long_weak(const zval *arg, zend_long
lval = zend_dval_to_lval(d);
/* This only checks for a fractional part as if doesn't fit it already throws a TypeError */
if (UNEXPECTED(!zend_is_long_compatible(d, lval))) {
/* Check arg_num is not (uint32_t)-1, as otherwise its called by
* zend_verify_weak_scalar_type_hint_no_sideeffect() */
if (arg_num != (uint32_t)-1) {
zend_incompatible_string_to_long_error(Z_STR_P(arg));
}
zend_incompatible_string_to_long_error(Z_STR_P(arg));
if (UNEXPECTED(EG(exception))) {
return 0;
}
Expand Down
Loading
Loading