Expose initializer zv to gc

Author: arnaud-lb

Zend/zend_lazy_objects.c

@@ -39,6 +39,7 @@
 #include "zend_API.h"
 #include "zend_compile.h"
 #include "zend_execute.h"
+#include "zend_gc.h"
 #include "zend_hash.h"
 #include "zend_object_handlers.h"
 #include "zend_objects_API.h"
@@ -665,3 +666,39 @@ HashTable *zend_lazy_object_debug_info(zend_object *object, int *is_temp)
 	*is_temp = 0;
 	return zend_get_properties_no_init(object);
 }
+
+HashTable *zend_lazy_object_get_gc(zend_object *zobj, zval **table, int *n)
+{
+	ZEND_ASSERT(zend_object_is_lazy(zobj));
+
+	zend_lazy_object_info *info = zend_lazy_object_get_info(zobj);
+	zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
+
+	if (zend_lazy_object_initialized(zobj)) {
+		ZEND_ASSERT(zend_object_is_lazy_proxy(zobj));
+		zend_get_gc_buffer_add_obj(gc_buffer, info->u.instance);
+		zend_get_gc_buffer_use(gc_buffer, table, n);
+		/* Initialized proxy object can not have properties */
+		return NULL;
+	}
+
+	zend_fcall_info_cache *fcc = &info->u.initializer.fcc;
+	if (fcc->object) {
+		zend_get_gc_buffer_add_obj(gc_buffer, fcc->object);
+	}
+	if (fcc->closure) {
+		zend_get_gc_buffer_add_obj(gc_buffer, fcc->closure);
+	}
+	zend_get_gc_buffer_add_zval(gc_buffer, &info->u.initializer.zv);
+
+	/* Uninitialized lazy objects can not have dynamic properties, so we can
+	 * ignore zobj->properties. */
+	zval *prop = zobj->properties_table;
+	zval *end = prop + zobj->ce->default_properties_count;
+	for ( ; prop < end; prop++) {
+		zend_get_gc_buffer_add_zval(gc_buffer, prop);
+	}
+
+	zend_get_gc_buffer_use(gc_buffer, table, n);
+	return NULL;
+}

Zend/zend_lazy_objects.h

@@ -74,6 +74,7 @@ zend_lazy_object_flags_t zend_lazy_object_get_flags(zend_object *obj);
 void zend_lazy_object_del_info(zend_object *obj);
 zend_object *zend_lazy_object_clone(zend_object *old_obj);
 HashTable *zend_lazy_object_debug_info(zend_object *object, int *is_temp);
+HashTable *zend_lazy_object_get_gc(zend_object *zobj, zval **table, int *n);
 bool zend_lazy_object_decr_lazy_props(zend_object *obj);
 void zend_lazy_object_realize(zend_object *obj);
 

Zend/zend_object_handlers.c

@@ -165,35 +165,7 @@ ZEND_API HashTable *zend_std_get_gc(zend_object *zobj, zval **table, int *n) /*
 		return zobj->handlers->get_properties(zobj);
 	} else {
 		if (UNEXPECTED(zend_object_is_lazy(zobj))) {
-			zend_get_gc_buffer *gc_buffer = zend_get_gc_buffer_create();
-			if (zend_lazy_object_initialized(zobj)) {
-				ZEND_ASSERT(zend_object_is_lazy_proxy(zobj));
-				zend_object *instance = zend_lazy_object_get_instance(zobj);
-				zend_get_gc_buffer_add_obj(gc_buffer, instance);
-			} else {
-				zend_fcall_info_cache* initializer = zend_lazy_object_get_initializer_fcc(zobj);
-				if (initializer) {
-					// TODO: also expose _get_initializer_zv() to the GC
-					if (initializer->object) {
-						zend_get_gc_buffer_add_obj(gc_buffer, initializer->object);
-					}
-					if (initializer->closure) {
-						zend_get_gc_buffer_add_obj(gc_buffer, initializer->closure);
-					}
-				}
-			}
-			if (zobj->properties) {
-				zend_get_gc_buffer_use(gc_buffer, table, n);
-				return zobj->properties;
-			} else {
-				zval *prop = zobj->properties_table;
-				zval *end = prop + zobj->ce->default_properties_count;
-				for ( ; prop < end; prop++) {
-					zend_get_gc_buffer_add_zval(gc_buffer, prop);
-				}
-				zend_get_gc_buffer_use(gc_buffer, table, n);
-				return NULL;
-			}
+			return zend_lazy_object_get_gc(zobj, table, n);
 		} else if (zobj->properties) {
 			*table = NULL;
 			*n = 0;