diff options
| -rw-r--r-- | Zend/zend_objects_API.c | 6 | ||||
| -rw-r--r-- | Zend/zend_objects_API.h | 7 |
2 files changed, 6 insertions, 7 deletions
diff --git a/Zend/zend_objects_API.c b/Zend/zend_objects_API.c index 00d9425f18..d828f55401 100644 --- a/Zend/zend_objects_API.c +++ b/Zend/zend_objects_API.c @@ -210,12 +210,6 @@ ZEND_API void zend_object_store_set_object(zval *zobject, zend_object *object) EG(objects_store).object_buckets[Z_OBJ_HANDLE_P(zobject)] = object; } -/* Called when the ctor was terminated by an exception */ -ZEND_API void zend_object_store_ctor_failed(zend_object *obj) -{ - GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; -} - ZEND_API zend_object_handlers *zend_get_std_object_handlers(void) { return &std_object_handlers; diff --git a/Zend/zend_objects_API.h b/Zend/zend_objects_API.h index 7dfad70fbc..ac4485fea3 100644 --- a/Zend/zend_objects_API.h +++ b/Zend/zend_objects_API.h @@ -61,7 +61,12 @@ ZEND_API void zend_objects_store_free(zend_object *object); /* See comment in zend_objects_API.c before you use this */ ZEND_API void zend_object_store_set_object(zval *zobject, zend_object *object); -ZEND_API void zend_object_store_ctor_failed(zend_object *object); + +/* Called when the ctor was terminated by an exception */ +static zend_always_inline void zend_object_store_ctor_failed(zend_object *obj) +{ + GC_FLAGS(obj) |= IS_OBJ_DESTRUCTOR_CALLED; +} ZEND_API void zend_objects_store_free_object_storage(zend_objects_store *objects); |