Merge branch 'master' of git.php.net:php-src

1 files changed, 6 insertions, 1 deletions

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);