Skip to content

Commit a7a7c7d

Browse files
committed
Make zend_objects_clone_obj_with() take a const HashTable
1 parent 8a87da8 commit a7a7c7d

File tree

5 files changed

+6
-6
lines changed

5 files changed

+6
-6
lines changed

Zend/zend_lazy_objects.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -709,7 +709,7 @@ ZEND_API HashTable *zend_lazy_object_get_properties(zend_object *object)
709709

710710
/* Initialize object and clone it. For proxies, we clone both the proxy and its
711711
* real instance, and we don't call __clone() on the proxy. */
712-
zend_object *zend_lazy_object_clone(zend_object *old_obj, zend_class_entry *scope, HashTable *properties)
712+
zend_object *zend_lazy_object_clone(zend_object *old_obj, zend_class_entry *scope, const HashTable *properties)
713713
{
714714
ZEND_ASSERT(zend_object_is_lazy(old_obj));
715715

Zend/zend_lazy_objects.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ zend_object *zend_lazy_object_get_instance(zend_object *obj);
7171
zend_lazy_object_flags_t zend_lazy_object_get_flags(zend_object *obj);
7272
void zend_lazy_object_del_info(zend_object *obj);
7373
ZEND_API HashTable *zend_lazy_object_get_properties(zend_object *object);
74-
zend_object *zend_lazy_object_clone(zend_object *old_obj, zend_class_entry *scope, HashTable *properties);
74+
zend_object *zend_lazy_object_clone(zend_object *old_obj, zend_class_entry *scope, const HashTable *properties);
7575
HashTable *zend_lazy_object_debug_info(zend_object *object, int *is_temp);
7676
HashTable *zend_lazy_object_get_gc(zend_object *zobj, zval **table, int *n);
7777
bool zend_lazy_object_decr_lazy_props(zend_object *obj);

Zend/zend_object_handlers.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -180,7 +180,7 @@ typedef void (*zend_object_free_obj_t)(zend_object *object);
180180
typedef void (*zend_object_dtor_obj_t)(zend_object *object);
181181

182182
typedef zend_object* (*zend_object_clone_obj_t)(zend_object *object);
183-
typedef zend_object* (*zend_object_clone_obj_with_t)(zend_object *object, zend_class_entry *scope, HashTable *properties);
183+
typedef zend_object* (*zend_object_clone_obj_with_t)(zend_object *object, zend_class_entry *scope, const HashTable *properties);
184184

185185
/* Get class name for display in var_dump and other debugging functions.
186186
* Must be defined and must return a non-NULL value. */

Zend/zend_objects.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -213,7 +213,7 @@ ZEND_API zend_object* ZEND_FASTCALL zend_objects_new(zend_class_entry *ce)
213213
return object;
214214
}
215215

216-
ZEND_API void ZEND_FASTCALL zend_objects_clone_members_ex(zend_object *new_object, zend_object *old_object, zend_class_entry *scope, HashTable *properties)
216+
ZEND_API void ZEND_FASTCALL zend_objects_clone_members_ex(zend_object *new_object, zend_object *old_object, zend_class_entry *scope, const HashTable *properties)
217217
{
218218
bool has_clone_method = old_object->ce->clone != NULL || properties != NULL;
219219

@@ -338,7 +338,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,
338338
zend_objects_clone_members_ex(new_object, old_object, old_object->ce, NULL);
339339
}
340340

341-
ZEND_API zend_object *zend_objects_clone_obj_with(zend_object *old_object, zend_class_entry *scope, HashTable *properties)
341+
ZEND_API zend_object *zend_objects_clone_obj_with(zend_object *old_object, zend_class_entry *scope, const HashTable *properties)
342342
{
343343
zend_object *new_object;
344344

Zend/zend_objects.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_clone_members(zend_object *new_object,
3030
ZEND_API void zend_object_std_dtor(zend_object *object);
3131
ZEND_API void zend_objects_destroy_object(zend_object *object);
3232
ZEND_API zend_object *zend_objects_clone_obj(zend_object *object);
33-
ZEND_API zend_object *zend_objects_clone_obj_with(zend_object *object, zend_class_entry *scope, HashTable *properties);
33+
ZEND_API zend_object *zend_objects_clone_obj_with(zend_object *object, zend_class_entry *scope, const HashTable *properties);
3434

3535
void zend_object_dtor_dynamic_properties(zend_object *object);
3636
void zend_object_dtor_property(zend_object *object, zval *p);

0 commit comments

Comments
 (0)