diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-02-28 00:52:12 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-02-28 00:52:12 +0300 |
| commit | 6f483dc94c524e35993325309470e358fc6f9c8e (patch) | |
| tree | 3f8cacb766405a195925a6c9dd38ee5c8545600c /Zend/zend_objects_API.c | |
| parent | 42022bc9439cd6d1210216ec40aa0930d37cb512 (diff) | |
| download | php-git-6f483dc94c524e35993325309470e358fc6f9c8e.tar.gz | |
Use macros to update specific parts of GC_TYPE_INFO() (direct assignments to GC_TYPE(), GC_FLAGS() and GC_INFO() are prohibited)
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 633b48a2cb..3e0baaa691 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -49,7 +49,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_sto zend_object *obj = objects->object_buckets[i]; if (IS_OBJ_VALID(obj)) { if (!(OBJ_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)) { - OBJ_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; + GC_ADD_FLAGS(obj, IS_OBJ_DESTRUCTOR_CALLED); if (obj->handlers->dtor_obj && (obj->handlers->dtor_obj != zend_objects_destroy_object @@ -74,7 +74,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_mark_destructed(zend_objects_stor zend_object *obj = *obj_ptr; if (IS_OBJ_VALID(obj)) { - OBJ_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; + GC_ADD_FLAGS(obj, IS_OBJ_DESTRUCTOR_CALLED); } obj_ptr++; } while (obj_ptr != end); @@ -99,7 +99,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_ obj = *obj_ptr; if (IS_OBJ_VALID(obj)) { if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { - OBJ_FLAGS(obj) |= IS_OBJ_FREE_CALLED; + GC_ADD_FLAGS(obj, IS_OBJ_FREE_CALLED); if (obj->handlers->free_obj && obj->handlers->free_obj != zend_object_std_dtor) { GC_ADDREF(obj); obj->handlers->free_obj(obj); @@ -114,7 +114,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_ obj = *obj_ptr; if (IS_OBJ_VALID(obj)) { if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { - OBJ_FLAGS(obj) |= IS_OBJ_FREE_CALLED; + GC_ADD_FLAGS(obj, IS_OBJ_FREE_CALLED); if (obj->handlers->free_obj) { GC_ADDREF(obj); obj->handlers->free_obj(obj); @@ -165,7 +165,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ * ZEND_ASSERT(GC_REFCOUNT(object) == 0); if (!(OBJ_FLAGS(object) & IS_OBJ_DESTRUCTOR_CALLED)) { - OBJ_FLAGS(object) |= IS_OBJ_DESTRUCTOR_CALLED; + GC_ADD_FLAGS(object, IS_OBJ_DESTRUCTOR_CALLED); if (object->handlers->dtor_obj && (object->handlers->dtor_obj != zend_objects_destroy_object @@ -182,7 +182,7 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ * EG(objects_store).object_buckets[handle] = SET_OBJ_INVALID(object); if (!(OBJ_FLAGS(object) & IS_OBJ_FREE_CALLED)) { - OBJ_FLAGS(object) |= IS_OBJ_FREE_CALLED; + GC_ADD_FLAGS(object, IS_OBJ_FREE_CALLED); if (object->handlers->free_obj) { GC_ADDREF(object); object->handlers->free_obj(object); |