Mark enums and static fake closures as not collectable

iluuu1994 · iluuu1994 · commit 6e1b1900f00f · 2025-09-22T23:27:33.000+02:00
Closes GH-19866
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -866,6 +866,9 @@ ZEND_API void zend_create_fake_closure(zval *res, zend_function *func, zend_clas
 
 	closure = (zend_closure *)Z_OBJ_P(res);
 	closure->func.common.fn_flags |= ZEND_ACC_FAKE_CLOSURE;
+	if (Z_TYPE(closure->this_ptr) != IS_OBJECT) {
+		GC_ADD_FLAGS(&closure->std, GC_NOT_COLLECTABLE);
+	}
 }
 /* }}} */
 
diff --git a/Zend/zend_enum.c b/Zend/zend_enum.c
@@ -39,6 +39,7 @@ ZEND_API zend_object_handlers zend_enum_object_handlers;
 zend_object *zend_enum_new(zval *result, zend_class_entry *ce, zend_string *case_name, zval *backing_value_zv)
 {
 	zend_object *zobj = zend_objects_new(ce);
+	GC_ADD_FLAGS(zobj, GC_NOT_COLLECTABLE);
 	ZVAL_OBJ(result, zobj);
 
 	zval *zname = OBJ_PROP_NUM(zobj, 0);

Original file line number	Diff line number	Diff line change
`@@ -866,6 +866,9 @@ ZEND_API void zend_create_fake_closure(zval res, zend_function func, zend_clas`
`866`	`866`
`867`	`867`	`closure = (zend_closure *)Z_OBJ_P(res);`
`868`	`868`	`closure->func.common.fn_flags \|= ZEND_ACC_FAKE_CLOSURE;`
	`869`	`+ if (Z_TYPE(closure->this_ptr) != IS_OBJECT) {`
	`870`	`+ GC_ADD_FLAGS(&closure->std, GC_NOT_COLLECTABLE);`
	`871`	`+ }`
`869`	`872`	`}`
`870`	`873`	`/* }}} */`
`871`	`874`
Original file line number	Diff line number	Diff line change
`@@ -39,6 +39,7 @@ ZEND_API zend_object_handlers zend_enum_object_handlers;`
`39`	`39`	`zend_object zend_enum_new(zval result, zend_class_entry ce, zend_string case_name, zval *backing_value_zv)`
`40`	`40`	`{`
`41`	`41`	`zend_object *zobj = zend_objects_new(ce);`
	`42`	`+ GC_ADD_FLAGS(zobj, GC_NOT_COLLECTABLE);`
`42`	`43`	`ZVAL_OBJ(result, zobj);`
`43`	`44`
`44`	`45`	`zval *zname = OBJ_PROP_NUM(zobj, 0);`