TODO / WS

Author: arnaud-lb

Zend/zend_lazy_objects.c

@@ -60,10 +60,7 @@ static void zend_lazy_object_info_dtor_func(zval *pElement)
 
 	if (info->flags & ZEND_LAZY_OBJECT_INITIALIZED) {
 		ZEND_ASSERT(info->flags & ZEND_LAZY_OBJECT_STRATEGY_VIRTUAL);
-		// TODO: GC?
-		if (GC_DELREF(info->u.instance) == 0) {
-			zend_objects_store_del(info->u.instance);
-		}
+		zend_object_release(info->u.instance);
 	} else {
 		zend_fcc_dtor(&info->u.initializer);
 	}

Zend/zend_lazy_objects.h

@@ -22,21 +22,21 @@
 #include "zend.h"
 
 /* Serialization skips initialization */
-#define ZEND_LAZY_OBJECT_SKIP_INITIALIZATION_ON_SERIALIZE (1<<0)
+#define ZEND_LAZY_OBJECT_SKIP_INITIALIZATION_ON_SERIALIZE   (1<<0)
 
 /* Lazy object is a virtual proxy */
-#define ZEND_LAZY_OBJECT_STRATEGY_VIRTUAL (1<<1)
+#define ZEND_LAZY_OBJECT_STRATEGY_VIRTUAL                   (1<<1)
 
 /* Lazy object is a ghost object */
-#define ZEND_LAZY_OBJECT_STRATEGY_GHOST (1<<2)
+#define ZEND_LAZY_OBJECT_STRATEGY_GHOST                     (1<<2)
 
 /* Lazy object is initialized (info.u is an instance) */
-#define ZEND_LAZY_OBJECT_INITIALIZED (1<<3)
+#define ZEND_LAZY_OBJECT_INITIALIZED                        (1<<3)
 
-#define ZEND_LAZY_OBJECT_USER_FLAGS (										\
-	ZEND_LAZY_OBJECT_SKIP_INITIALIZATION_ON_SERIALIZE |						\
-	ZEND_LAZY_OBJECT_STRATEGY_GHOST |										\
-	ZEND_LAZY_OBJECT_STRATEGY_VIRTUAL										\
+#define ZEND_LAZY_OBJECT_USER_FLAGS (                                       \
+	ZEND_LAZY_OBJECT_SKIP_INITIALIZATION_ON_SERIALIZE |                     \
+	ZEND_LAZY_OBJECT_STRATEGY_GHOST |                                       \
+	ZEND_LAZY_OBJECT_STRATEGY_VIRTUAL                                       \
 )
 
 /* Temporarily allow raw access to the lazy object without triggering