Skip to content

tree-wide: Generate nicer code in Z_PARAM_*() helpers wrapping Z_PARAM_*() #23100

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

Merged
TimWolla merged 1 commit into from
Aug 7, 2026
+13 −13
Merged

tree-wide: Generate nicer code in Z_PARAM_*() helpers wrapping Z_PARAM_*() #23100

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
6 changes: 3 additions & 3 deletions Zend/zend_API.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2057,9 +2057,9 @@ ZEND_API ZEND_COLD void zend_class_redeclaration_error_ex(int type, zend_string

#define Z_PARAM_ENUM(dest, _ce) \
{ \
zend_object *_tmp = NULL; \
Z_PARAM_OBJ_OF_CLASS(_tmp, _ce); \
dest = zend_enum_fetch_case_id(_tmp); \
zend_object *__##dest = NULL; \
Z_PARAM_OBJ_OF_CLASS(__##dest, _ce); \
dest = zend_enum_fetch_case_id(__##dest); \
}

/* old "p" */
Expand Down
12 changes: 6 additions & 6 deletions ext/date/php_time.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,15 +29,15 @@ typedef struct php_date_time_duration {
# define Z_DATE_TIME_DURATION_P(zv) php_date_time_duration_from_obj(Z_OBJ_P((zv)))

# define Z_PARAM_DATE_TIME_DURATION(d) { \
zend_object *__d; \
Z_PARAM_OBJ_OF_CLASS(__d, php_date_ce_time_duration); \
d = php_date_time_duration_from_obj(__d); \
zend_object *__##d; \
Z_PARAM_OBJ_OF_CLASS(__##d, php_date_ce_time_duration); \
d = php_date_time_duration_from_obj(__##d); \
}

# define Z_PARAM_DATE_TIME_DURATION_OR_NULL(d) { \
zend_object *__d; \
Z_PARAM_OBJ_OF_CLASS_OR_NULL(__d, php_date_ce_time_duration); \
d = __d ? php_date_time_duration_from_obj(__d) : NULL; \
zend_object *__##d; \
Z_PARAM_OBJ_OF_CLASS_OR_NULL(__##d, php_date_ce_time_duration); \
d = __##d ? php_date_time_duration_from_obj(__##d) : NULL; \
}

PHPAPI extern zend_class_entry *php_date_ce_time_duration;
Expand Down
8 changes: 4 additions & 4 deletions ext/date/time_duration.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,14 +29,14 @@ ZEND_STATIC_ASSERT(NANOS_IN_MICRO * MICROS_IN_SEC == NANOS_IN_SEC, "");
ZEND_STATIC_ASSERT(NANOS_IN_MILLI * MILLIS_IN_SEC == NANOS_IN_SEC, "");

#define Z_PARAM_ULONG(l) { \
zend_long __l; \
Z_PARAM_LONG(__l); \
if (__l < 0) { \
zend_long __##l; \
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; \
break; \
} \
l = __l; \
l = __##l; \
}

ZEND_COLD static void throw_out_of_range_exception(void)
Expand Down
Loading