Skip to content

zend_objects: Make old_object a const* in zend_objects_clone_members() #22089

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 2 commits into from
May 19, 2026
Merged

zend_objects: Make old_object a const* in zend_objects_clone_members() #22089

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
09db220
zend_objects: Make `old_object` a `const*` in `zend_objects_clone_mem…
TimWolla May 19, 2026
f9292ef
tree-wide: Make the original object `const` in `clone_obj` handlers
TimWolla May 19, 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
6 changes: 3 additions & 3 deletions Zend/zend_objects.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,14 +193,14 @@ ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce)
return object;
}

ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, zend_object *old_object)
ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, const zend_object *old_object)
{
bool has_clone_method = old_object->ce->clone != NULL;

if (old_object->ce->default_properties_count) {
zval *src = old_object->properties_table;
const zval *src = old_object->properties_table;
zval *dst = new_object->properties_table;
zval *end = src + old_object->ce->default_properties_count;
const zval *end = src + old_object->ce->default_properties_count;

do {
i_zval_ptr_dtor(dst);
Expand Down
2 changes: 1 addition & 1 deletion Zend/zend_objects.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@
BEGIN_EXTERN_C()
ZEND_API void ZEND_FASTCALL zend_object_std_init(zend_object *object, zend_class_entry *ce);
ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce);
ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, zend_object *old_object);
ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object, const zend_object *old_object);

ZEND_API void zend_object_std_dtor(zend_object *object);
ZEND_API void zend_objects_destroy_object(zend_object *object);
Expand Down
8 changes: 4 additions & 4 deletions ext/date/php_date.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1831,7 +1831,7 @@ static zend_object *date_object_new_date(zend_class_entry *class_type) /* {{{ */

static zend_object *date_object_clone_date(zend_object *this_ptr) /* {{{ */
{
php_date_obj *old_obj = php_date_obj_from_obj(this_ptr);
const php_date_obj *old_obj = php_date_obj_from_obj(this_ptr);
php_date_obj *new_obj = php_date_obj_from_obj(date_object_new_date(old_obj->std.ce));

zend_objects_clone_members(&new_obj->std, &old_obj->std);
Expand Down Expand Up @@ -1988,7 +1988,7 @@ static zend_object *date_object_new_timezone(zend_class_entry *class_type) /* {{

static zend_object *date_object_clone_timezone(zend_object *this_ptr) /* {{{ */
{
php_timezone_obj *old_obj = php_timezone_obj_from_obj(this_ptr);
const php_timezone_obj *old_obj = php_timezone_obj_from_obj(this_ptr);
php_timezone_obj *new_obj = php_timezone_obj_from_obj(date_object_new_timezone(old_obj->std.ce));

zend_objects_clone_members(&new_obj->std, &old_obj->std);
Expand Down Expand Up @@ -2131,7 +2131,7 @@ static zend_object *date_object_new_interval(zend_class_entry *class_type) /* {{

static zend_object *date_object_clone_interval(zend_object *this_ptr) /* {{{ */
{
php_interval_obj *old_obj = php_interval_obj_from_obj(this_ptr);
const php_interval_obj *old_obj = php_interval_obj_from_obj(this_ptr);
php_interval_obj *new_obj = php_interval_obj_from_obj(date_object_new_interval(old_obj->std.ce));

zend_objects_clone_members(&new_obj->std, &old_obj->std);
Expand Down Expand Up @@ -2222,7 +2222,7 @@ static zend_object *date_object_new_period(zend_class_entry *class_type) /* {{{

static zend_object *date_object_clone_period(zend_object *this_ptr) /* {{{ */
{
php_period_obj *old_obj = php_period_obj_from_obj(this_ptr);
const php_period_obj *old_obj = php_period_obj_from_obj(this_ptr);
php_period_obj *new_obj = php_period_obj_from_obj(date_object_new_period(old_obj->std.ce));

zend_objects_clone_members(&new_obj->std, &old_obj->std);
Expand Down
2 changes: 1 addition & 1 deletion ext/gmp/gmp.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -283,7 +283,7 @@ static HashTable *gmp_get_debug_info(zend_object *obj, int *is_temp) /* {{{ */

static zend_object *gmp_clone_obj(zend_object *obj) /* {{{ */
{
gmp_object *old_object = GET_GMP_OBJECT_FROM_OBJ(obj);
const gmp_object *old_object = GET_GMP_OBJECT_FROM_OBJ(obj);
gmp_object *new_object = GET_GMP_OBJECT_FROM_OBJ(gmp_create_object(obj->ce));

zend_objects_clone_members( &new_object->std, &old_object->std);
Expand Down
2 changes: 1 addition & 1 deletion ext/hash/hash.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1397,7 +1397,7 @@ static void php_hashcontext_free(zend_object *obj) {

/* {{{ php_hashcontext_clone */
static zend_object *php_hashcontext_clone(zend_object *zobj) {
php_hashcontext_object *oldobj = php_hashcontext_from_object(zobj);
const php_hashcontext_object *oldobj = php_hashcontext_from_object(zobj);
zend_object *znew = php_hashcontext_create(zobj->ce);
php_hashcontext_object *newobj = php_hashcontext_from_object(znew);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/breakiterator/breakiterator_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -96,7 +96,7 @@ static int BreakIterator_compare_objects(zval *object1,
/* {{{ clone handler for BreakIterator */
static zend_object *BreakIterator_clone_obj(zend_object *object)
{
BreakIterator_object *bio_orig = php_intl_breakiterator_fetch_object(object);
const BreakIterator_object *bio_orig = php_intl_breakiterator_fetch_object(object);
zend_object *ret_val = BreakIterator_ce_ptr->create_object(object->ce);
BreakIterator_object *bio_new = php_intl_breakiterator_fetch_object(ret_val);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/calendar/calendar_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ U_CFUNC void calendar_object_construct(zval *object,
/* {{{ clone handler for Calendar */
static zend_object *Calendar_clone_obj(zend_object *object)
{
Calendar_object *co_orig = php_intl_calendar_fetch_object(object);
const Calendar_object *co_orig = php_intl_calendar_fetch_object(object);
zend_object *ret_val = Calendar_ce_ptr->create_object(object->ce);
Calendar_object *co_new = php_intl_calendar_fetch_object(ret_val);

Expand Down
3 changes: 2 additions & 1 deletion ext/intl/converter/converter.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -934,7 +934,8 @@ static zend_object *php_converter_create_object(zend_class_entry *ce) {
}

static zend_object *php_converter_clone_object(zend_object *object) {
php_converter_object *objval, *oldobj = php_converter_fetch_object(object);
const php_converter_object *oldobj = php_converter_fetch_object(object);
php_converter_object *objval;
zend_object *retval = php_converter_object_ctor(object->ce, &objval);
UErrorCode error = U_ZERO_ERROR;

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/dateformat/dateformat_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@ zend_object *IntlDateFormatter_object_create(zend_class_entry *ce)
/* {{{ IntlDateFormatter_object_clone */
zend_object *IntlDateFormatter_object_clone(zend_object *object)
{
IntlDateFormatter_object *dfo = php_intl_dateformatter_fetch_object(object);
const IntlDateFormatter_object *dfo = php_intl_dateformatter_fetch_object(object);
zend_object *new_obj = IntlDateFormatter_ce_ptr->create_object(object->ce);
IntlDateFormatter_object *new_dfo = php_intl_dateformatter_fetch_object(new_obj);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/dateformat/datepatterngenerator_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ zend_object_handlers IntlDatePatternGenerator_handlers;

static zend_object *IntlDatePatternGenerator_object_clone(zend_object *object)
{
IntlDatePatternGenerator_object *dtpgo_orig = php_intl_datepatterngenerator_fetch_object(object);
const IntlDatePatternGenerator_object *dtpgo_orig = php_intl_datepatterngenerator_fetch_object(object);
zend_object *ret_val = IntlDatePatternGenerator_ce_ptr->create_object(object->ce);
IntlDatePatternGenerator_object *dtpgo_new = php_intl_datepatterngenerator_fetch_object(ret_val);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/formatter/formatter_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@ U_CFUNC zend_object *NumberFormatter_object_create(zend_class_entry *ce)
/* {{{ NumberFormatter_object_clone */
U_CFUNC zend_object *NumberFormatter_object_clone(zend_object *object)
{
NumberFormatter_object *nfo = php_intl_number_format_fetch_object(object);
const NumberFormatter_object *nfo = php_intl_number_format_fetch_object(object);
zend_object *new_obj = NumberFormatter_ce_ptr->create_object(object->ce);
NumberFormatter_object *new_nfo = php_intl_number_format_fetch_object(new_obj);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/msgformat/msgformat_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ U_CFUNC zend_object *MessageFormatter_object_create(zend_class_entry *ce)
/* {{{ MessageFormatter_object_clone */
U_CFUNC zend_object *MessageFormatter_object_clone(zend_object *object)
{
MessageFormatter_object *mfo = php_intl_messageformatter_fetch_object(object);
const MessageFormatter_object *mfo = php_intl_messageformatter_fetch_object(object);
zend_object *new_obj = MessageFormatter_ce_ptr->create_object(object->ce);
MessageFormatter_object *new_mfo = php_intl_messageformatter_fetch_object(new_obj);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/spoofchecker/spoofchecker_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ U_CFUNC zend_object *Spoofchecker_object_create(zend_class_entry *ce)

static zend_object *spoofchecker_clone_obj(zend_object *object) /* {{{ */
{
Spoofchecker_object *spoofchecker_orig = php_intl_spoofchecker_fetch_object(object);
const Spoofchecker_object *spoofchecker_orig = php_intl_spoofchecker_fetch_object(object);
zend_object *new_obj_val = Spoofchecker_ce_ptr->create_object(object->ce);
Spoofchecker_object *spoofchecker_new = php_intl_spoofchecker_fetch_object(new_obj_val);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/timezone/timezone_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,7 +207,7 @@ U_CFUNC TimeZone *timezone_process_timezone_argument(
/* {{{ clone handler for TimeZone */
static zend_object *TimeZone_clone_obj(zend_object *object)
{
TimeZone_object *to_orig = php_intl_timezone_fetch_object(object);
const TimeZone_object *to_orig = php_intl_timezone_fetch_object(object);
zend_object *ret_val = TimeZone_ce_ptr->create_object(object->ce);
TimeZone_object *to_new = php_intl_timezone_fetch_object(ret_val);

Expand Down
2 changes: 1 addition & 1 deletion ext/intl/transliterator/transliterator_class.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -130,7 +130,7 @@ static zend_object *Transliterator_object_create( zend_class_entry *ce )
/* {{{ clone handler for Transliterator */
static zend_object *Transliterator_clone_obj( zend_object *object )
{
Transliterator_object *to_orig = php_intl_transliterator_fetch_object(object);
const Transliterator_object *to_orig = php_intl_transliterator_fetch_object(object);
zend_object *ret_val = Transliterator_ce_ptr->create_object(object->ce);
Transliterator_object *to_new = php_intl_transliterator_fetch_object(ret_val);

Expand Down
2 changes: 1 addition & 1 deletion ext/random/random.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -273,7 +273,7 @@ PHPAPI void php_random_engine_common_free_object(zend_object *object)

PHPAPI zend_object *php_random_engine_common_clone_object(zend_object *object)
{
php_random_engine *old_engine = php_random_engine_from_obj(object);
const php_random_engine *old_engine = php_random_engine_from_obj(object);
php_random_engine *new_engine = php_random_engine_from_obj(old_engine->std.ce->create_object(old_engine->std.ce));

new_engine->engine.algo = old_engine->engine.algo;
Expand Down
2 changes: 1 addition & 1 deletion ext/uri/php_uri.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1034,7 +1034,7 @@ PHPAPI void php_uri_object_handler_free(zend_object *object)

PHPAPI zend_object *php_uri_object_handler_clone(zend_object *object)
{
php_uri_object *uri_object = php_uri_object_from_obj(object);
const php_uri_object *uri_object = php_uri_object_from_obj(object);

ZEND_ASSERT(uri_object->uri != NULL);

Expand Down
Loading