diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2018-01-22 15:57:00 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2018-01-22 15:57:00 +0300 |
| commit | b3e22da745957a6d67bc604268184eb8ba161a08 (patch) | |
| tree | dcfe51e8cf081019136cf0b8bdb2ad6983e9c873 /Zend/zend_objects_API.c | |
| parent | 6fb5568b2de6430955936235e29413c1de4c6253 (diff) | |
| download | php-git-b3e22da745957a6d67bc604268184eb8ba161a08.tar.gz | |
Use OBJ_FLAGS() macro to access object flags (even if they are currently stored together with GC_FLAGS)
Diffstat (limited to 'Zend/zend_objects_API.c')
| -rw-r--r-- | Zend/zend_objects_API.c | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index a8d9d0ea25..633b48a2cb 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -48,8 +48,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_call_destructors(zend_objects_sto for (i = 1; i < objects->top; i++) { zend_object *obj = objects->object_buckets[i]; if (IS_OBJ_VALID(obj)) { - if (!(GC_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)) { - GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; + if (!(OBJ_FLAGS(obj) & IS_OBJ_DESTRUCTOR_CALLED)) { + OBJ_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)) { - GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; + OBJ_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; } obj_ptr++; } while (obj_ptr != end); @@ -98,8 +98,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_ obj_ptr--; obj = *obj_ptr; if (IS_OBJ_VALID(obj)) { - if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { - GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED; + if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { + OBJ_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); @@ -113,8 +113,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_free_object_storage(zend_objects_ obj_ptr--; obj = *obj_ptr; if (IS_OBJ_VALID(obj)) { - if (!(GC_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { - GC_FLAGS(obj) |= IS_OBJ_FREE_CALLED; + if (!(OBJ_FLAGS(obj) & IS_OBJ_FREE_CALLED)) { + OBJ_FLAGS(obj) |= IS_OBJ_FREE_CALLED; if (obj->handlers->free_obj) { GC_ADDREF(obj); obj->handlers->free_obj(obj); @@ -164,8 +164,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ * ZEND_ASSERT(IS_OBJ_VALID(EG(objects_store).object_buckets[object->handle])); ZEND_ASSERT(GC_REFCOUNT(object) == 0); - if (!(GC_FLAGS(object) & IS_OBJ_DESTRUCTOR_CALLED)) { - GC_FLAGS(object) |= IS_OBJ_DESTRUCTOR_CALLED; + if (!(OBJ_FLAGS(object) & IS_OBJ_DESTRUCTOR_CALLED)) { + OBJ_FLAGS(object) |= IS_OBJ_DESTRUCTOR_CALLED; if (object->handlers->dtor_obj && (object->handlers->dtor_obj != zend_objects_destroy_object @@ -181,8 +181,8 @@ ZEND_API void ZEND_FASTCALL zend_objects_store_del(zend_object *object) /* {{{ * void *ptr; EG(objects_store).object_buckets[handle] = SET_OBJ_INVALID(object); - if (!(GC_FLAGS(object) & IS_OBJ_FREE_CALLED)) { - GC_FLAGS(object) |= IS_OBJ_FREE_CALLED; + if (!(OBJ_FLAGS(object) & IS_OBJ_FREE_CALLED)) { + OBJ_FLAGS(object) |= IS_OBJ_FREE_CALLED; if (object->handlers->free_obj) { GC_ADDREF(object); object->handlers->free_obj(object); |