Automatically handle ZEND_ACC_MAY_BE_CYCLIC for extensions

iluuu1994 · iluuu1994 · commit 969a472f7269 · 2024-12-13T10:23:33.000+01:00
If get_gc is customized, assume cyclic classes for now.
diff --git a/Zend/zend_API.c b/Zend/zend_API.c
@@ -2390,6 +2390,8 @@ ZEND_API zend_result zend_startup_module_ex(zend_module_entry *module) /* {{{ */
 	}
 	module->module_started = 1;
 
+	uint32_t prev_class_count = zend_hash_num_elements(CG(class_table));
+
 	/* Check module dependencies */
 	if (module->deps) {
 		const zend_module_dep *dep = module->deps;
@@ -2434,6 +2436,19 @@ ZEND_API zend_result zend_startup_module_ex(zend_module_entry *module) /* {{{ */
 		}
 		EG(current_module) = NULL;
 	}
+
+	/* Mark classes with custom get_gc handler as potentially cyclic, even if
+	 * their properties don't indicate so. */
+	if (prev_class_count != zend_hash_num_elements(CG(class_table))) {
+		Bucket *p;
+		ZEND_HASH_MAP_FOREACH_BUCKET_FROM(CG(class_table), p, prev_class_count) {
+			zend_class_entry *ce = Z_PTR(p->val);
+			if (ce->default_object_handlers->get_gc != zend_std_get_gc) {
+				ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
+			}
+		} ZEND_HASH_FOREACH_END();
+	}
+
 	return SUCCESS;
 }
 /* }}} */
diff --git a/Zend/zend_closures.c b/Zend/zend_closures.c
@@ -705,9 +705,8 @@ void zend_register_closure_ce(void) /* {{{ */
 	zend_ce_closure = register_class_Closure();
 	zend_ce_closure->create_object = zend_closure_new;
 	zend_ce_closure->default_object_handlers = &closure_handlers;
-	/* FIXME: Potentially improve during construction of closure? static closures
-	 * not binding by references can't be cyclic. */
-	zend_ce_closure->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
+	/* FIXME: Potentially infer ZEND_ACC_MAY_BE_CYCLIC during construction of
+	 * closure? static closures not binding by references can't be cyclic. */
 
 	memcpy(&closure_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	closure_handlers.free_obj = zend_closure_free_storage;
diff --git a/Zend/zend_fibers.c b/Zend/zend_fibers.c
@@ -1107,7 +1107,6 @@ void zend_register_fiber_ce(void)
 	zend_ce_fiber = register_class_Fiber();
 	zend_ce_fiber->create_object = zend_fiber_object_create;
 	zend_ce_fiber->default_object_handlers = &zend_fiber_handlers;
-	zend_ce_fiber->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	zend_fiber_handlers = std_object_handlers;
 	zend_fiber_handlers.dtor_obj = zend_fiber_object_destroy;
diff --git a/Zend/zend_generators.c b/Zend/zend_generators.c
@@ -1215,7 +1215,6 @@ void zend_register_generator_ce(void) /* {{{ */
 	/* get_iterator has to be assigned *after* implementing the interface */
 	zend_ce_generator->get_iterator = zend_generator_get_iterator;
 	zend_ce_generator->default_object_handlers = &zend_generator_handlers;
-	zend_ce_generator->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&zend_generator_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	zend_generator_handlers.free_obj = zend_generator_free_storage;
diff --git a/Zend/zend_weakrefs.c b/Zend/zend_weakrefs.c
@@ -788,7 +788,6 @@ void zend_register_weakref_ce(void) /* {{{ */
 	zend_ce_weakmap->create_object = zend_weakmap_create_object;
 	zend_ce_weakmap->get_iterator = zend_weakmap_get_iterator;
 	zend_ce_weakmap->default_object_handlers = &zend_weakmap_handlers;
-	zend_ce_weakmap->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&zend_weakmap_handlers, zend_get_std_object_handlers(), sizeof(zend_object_handlers));
 	zend_weakmap_handlers.offset = XtOffsetOf(zend_weakmap, std);
diff --git a/ext/curl/interface.c b/ext/curl/interface.c
@@ -395,7 +395,6 @@ PHP_MINIT_FUNCTION(curl)
 	curl_ce = register_class_CurlHandle();
 	curl_ce->create_object = curl_create_object;
 	curl_ce->default_object_handlers = &curl_object_handlers;
-	curl_ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&curl_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	curl_object_handlers.offset = XtOffsetOf(php_curl, std);
diff --git a/ext/curl/multi.c b/ext/curl/multi.c
@@ -606,7 +606,6 @@ static zend_object_handlers curl_multi_handlers;
 void curl_multi_register_handlers(void) {
 	curl_multi_ce->create_object = curl_multi_create_object;
 	curl_multi_ce->default_object_handlers = &curl_multi_handlers;
-	curl_multi_ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&curl_multi_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	curl_multi_handlers.offset = XtOffsetOf(php_curlm, std);
diff --git a/ext/dom/php_dom.c b/ext/dom/php_dom.c
@@ -1292,7 +1292,6 @@ PHP_MINIT_FUNCTION(dom)
 	dom_xpath_class_entry = register_class_DOMXPath();
 	dom_xpath_class_entry->create_object = dom_xpath_objects_new;
 	dom_xpath_class_entry->default_object_handlers = &dom_xpath_object_handlers;
-	dom_xpath_class_entry->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	zend_hash_init(&dom_xpath_prop_handlers, 0, NULL, NULL, true);
 	DOM_REGISTER_PROP_HANDLER(&dom_xpath_prop_handlers, "document", dom_xpath_document_read, NULL);
@@ -1302,7 +1301,6 @@ PHP_MINIT_FUNCTION(dom)
 	dom_modern_xpath_class_entry = register_class_Dom_XPath();
 	dom_modern_xpath_class_entry->create_object = dom_xpath_objects_new;
 	dom_modern_xpath_class_entry->default_object_handlers = &dom_xpath_object_handlers;
-	dom_modern_xpath_class_entry->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	zend_hash_add_new_ptr(&classes, dom_modern_xpath_class_entry->name, &dom_xpath_prop_handlers);
 #endif
diff --git a/ext/pdo/pdo_dbh.c b/ext/pdo/pdo_dbh.c
@@ -1449,7 +1449,6 @@ void pdo_dbh_init(int module_number)
 	pdo_dbh_ce = register_class_PDO();
 	pdo_dbh_ce->create_object = pdo_dbh_new;
 	pdo_dbh_ce->default_object_handlers = &pdo_dbh_object_handlers;
-	pdo_dbh_ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&pdo_dbh_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	pdo_dbh_object_handlers.offset = XtOffsetOf(pdo_dbh_object_t, std);
diff --git a/ext/pdo/pdo_stmt.c b/ext/pdo/pdo_stmt.c
@@ -2491,7 +2491,6 @@ void pdo_stmt_init(void)
 	pdo_dbstmt_ce->get_iterator = pdo_stmt_iter_get;
 	pdo_dbstmt_ce->create_object = pdo_dbstmt_new;
 	pdo_dbstmt_ce->default_object_handlers = &pdo_dbstmt_object_handlers;
-	pdo_dbstmt_ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&pdo_dbstmt_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	pdo_dbstmt_object_handlers.offset = XtOffsetOf(pdo_stmt_t, std);
diff --git a/ext/reflection/php_reflection.c b/ext/reflection/php_reflection.c
@@ -7692,113 +7692,91 @@ PHP_MINIT_FUNCTION(reflection) /* {{{ */
 
 	reflection_function_abstract_ptr = register_class_ReflectionFunctionAbstract(reflector_ptr);
 	reflection_function_abstract_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_function_abstract_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	reflection_function_abstract_ptr->create_object = reflection_objects_new;
 
 	reflection_function_ptr = register_class_ReflectionFunction(reflection_function_abstract_ptr);
 	reflection_function_ptr->create_object = reflection_objects_new;
 	reflection_function_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_function_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_generator_ptr = register_class_ReflectionGenerator();
 	reflection_generator_ptr->create_object = reflection_objects_new;
 	reflection_generator_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_generator_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_parameter_ptr = register_class_ReflectionParameter(reflector_ptr);
 	reflection_parameter_ptr->create_object = reflection_objects_new;
 	reflection_parameter_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_parameter_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_type_ptr = register_class_ReflectionType(zend_ce_stringable);
 	reflection_type_ptr->create_object = reflection_objects_new;
 	reflection_type_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_type_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_named_type_ptr = register_class_ReflectionNamedType(reflection_type_ptr);
 	reflection_named_type_ptr->create_object = reflection_objects_new;
 	reflection_named_type_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_named_type_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_union_type_ptr = register_class_ReflectionUnionType(reflection_type_ptr);
 	reflection_union_type_ptr->create_object = reflection_objects_new;
 	reflection_union_type_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_union_type_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_intersection_type_ptr = register_class_ReflectionIntersectionType(reflection_type_ptr);
 	reflection_intersection_type_ptr->create_object = reflection_objects_new;
 	reflection_intersection_type_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_intersection_type_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_method_ptr = register_class_ReflectionMethod(reflection_function_abstract_ptr);
 	reflection_method_ptr->create_object = reflection_objects_new;
 	reflection_method_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_method_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_class_ptr = register_class_ReflectionClass(reflector_ptr);
 	reflection_class_ptr->create_object = reflection_objects_new;
 	reflection_class_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_class_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_object_ptr = register_class_ReflectionObject(reflection_class_ptr);
 	reflection_object_ptr->create_object = reflection_objects_new;
 	reflection_object_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_object_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_property_ptr = register_class_ReflectionProperty(reflector_ptr);
 	reflection_property_ptr->create_object = reflection_objects_new;
 	reflection_property_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_property_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_class_constant_ptr = register_class_ReflectionClassConstant(reflector_ptr);
 	reflection_class_constant_ptr->create_object = reflection_objects_new;
 	reflection_class_constant_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_class_constant_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_extension_ptr = register_class_ReflectionExtension(reflector_ptr);
 	reflection_extension_ptr->create_object = reflection_objects_new;
 	reflection_extension_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_extension_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_zend_extension_ptr = register_class_ReflectionZendExtension(reflector_ptr);
 	reflection_zend_extension_ptr->create_object = reflection_objects_new;
 	reflection_zend_extension_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_zend_extension_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_reference_ptr = register_class_ReflectionReference();
 	reflection_reference_ptr->create_object = reflection_objects_new;
 	reflection_reference_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_reference_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_attribute_ptr = register_class_ReflectionAttribute(reflector_ptr);
 	reflection_attribute_ptr->create_object = reflection_objects_new;
 	reflection_attribute_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_attribute_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_enum_ptr = register_class_ReflectionEnum(reflection_class_ptr);
 	reflection_enum_ptr->create_object = reflection_objects_new;
 	reflection_enum_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_enum_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_enum_unit_case_ptr = register_class_ReflectionEnumUnitCase(reflection_class_constant_ptr);
 	reflection_enum_unit_case_ptr->create_object = reflection_objects_new;
 	reflection_enum_unit_case_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_enum_unit_case_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_enum_backed_case_ptr = register_class_ReflectionEnumBackedCase(reflection_enum_unit_case_ptr);
 	reflection_enum_backed_case_ptr->create_object = reflection_objects_new;
 	reflection_enum_backed_case_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_enum_backed_case_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_fiber_ptr = register_class_ReflectionFiber();
 	reflection_fiber_ptr->create_object = reflection_objects_new;
 	reflection_fiber_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_fiber_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_constant_ptr = register_class_ReflectionConstant(reflector_ptr);
 	reflection_constant_ptr->create_object = reflection_objects_new;
 	reflection_constant_ptr->default_object_handlers = &reflection_object_handlers;
-	reflection_constant_ptr->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	reflection_property_hook_type_ptr = register_class_PropertyHookType();
 
diff --git a/ext/simplexml/simplexml.c b/ext/simplexml/simplexml.c
@@ -2654,7 +2654,6 @@ PHP_MINIT_FUNCTION(simplexml)
 	ce_SimpleXMLElement = register_class_SimpleXMLElement(zend_ce_stringable, zend_ce_countable, spl_ce_RecursiveIterator);
 	ce_SimpleXMLElement->create_object = sxe_object_new;
 	ce_SimpleXMLElement->default_object_handlers = &sxe_object_handlers;
-	ce_SimpleXMLElement->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	ce_SimpleXMLElement->get_iterator = php_sxe_get_iterator;
 
 	memcpy(&sxe_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
diff --git a/ext/sockets/sockets.c b/ext/sockets/sockets.c
@@ -455,7 +455,6 @@ static PHP_MINIT_FUNCTION(sockets)
 	socket_ce = register_class_Socket();
 	socket_ce->create_object = socket_create_object;
 	socket_ce->default_object_handlers = &socket_object_handlers;
-	socket_ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&socket_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	socket_object_handlers.offset = XtOffsetOf(php_socket, std);
diff --git a/ext/spl/spl_array.c b/ext/spl/spl_array.c
@@ -1883,7 +1883,6 @@ PHP_MINIT_FUNCTION(spl_array)
 	spl_ce_ArrayObject = register_class_ArrayObject(zend_ce_aggregate, zend_ce_arrayaccess, zend_ce_serializable, zend_ce_countable);
 	spl_ce_ArrayObject->create_object = spl_array_object_new;
 	spl_ce_ArrayObject->default_object_handlers = &spl_handler_ArrayObject;
-	spl_ce_ArrayObject->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&spl_handler_ArrayObject, &std_object_handlers, sizeof(zend_object_handlers));
 
@@ -1910,7 +1909,6 @@ PHP_MINIT_FUNCTION(spl_array)
 	spl_ce_ArrayIterator = register_class_ArrayIterator(spl_ce_SeekableIterator, zend_ce_arrayaccess, zend_ce_serializable, zend_ce_countable);
 	spl_ce_ArrayIterator->create_object = spl_array_object_new;
 	spl_ce_ArrayIterator->default_object_handlers = &spl_handler_ArrayObject;
-	spl_ce_ArrayIterator->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	spl_ce_ArrayIterator->get_iterator = spl_array_get_iterator;
 
 	spl_ce_RecursiveArrayIterator = register_class_RecursiveArrayIterator(spl_ce_ArrayIterator, spl_ce_RecursiveIterator);
diff --git a/ext/spl/spl_dllist.c b/ext/spl/spl_dllist.c
@@ -1256,7 +1256,6 @@ PHP_MINIT_FUNCTION(spl_dllist) /* {{{ */
 	);
 	spl_ce_SplDoublyLinkedList->create_object = spl_dllist_object_new;
 	spl_ce_SplDoublyLinkedList->default_object_handlers = &spl_handler_SplDoublyLinkedList;
-	spl_ce_SplDoublyLinkedList->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	spl_ce_SplDoublyLinkedList->get_iterator = spl_dllist_get_iterator;
 
 	memcpy(&spl_handler_SplDoublyLinkedList, &std_object_handlers, sizeof(zend_object_handlers));
diff --git a/ext/spl/spl_fixedarray.c b/ext/spl/spl_fixedarray.c
@@ -964,7 +964,6 @@ PHP_MINIT_FUNCTION(spl_fixedarray)
 		zend_ce_aggregate, zend_ce_arrayaccess, zend_ce_countable, php_json_serializable_ce);
 	spl_ce_SplFixedArray->create_object = spl_fixedarray_new;
 	spl_ce_SplFixedArray->default_object_handlers = &spl_handler_SplFixedArray;
-	spl_ce_SplFixedArray->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	spl_ce_SplFixedArray->get_iterator = spl_fixedarray_get_iterator;
 
 	memcpy(&spl_handler_SplFixedArray, &std_object_handlers, sizeof(zend_object_handlers));
diff --git a/ext/spl/spl_heap.c b/ext/spl/spl_heap.c
@@ -1141,7 +1141,6 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */
 	spl_ce_SplHeap = register_class_SplHeap(zend_ce_iterator, zend_ce_countable);
 	spl_ce_SplHeap->create_object = spl_heap_object_new;
 	spl_ce_SplHeap->default_object_handlers = &spl_handler_SplHeap;
-	spl_ce_SplHeap->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	spl_ce_SplHeap->get_iterator = spl_heap_get_iterator;
 
 	memcpy(&spl_handler_SplHeap, &std_object_handlers, sizeof(zend_object_handlers));
@@ -1163,7 +1162,6 @@ PHP_MINIT_FUNCTION(spl_heap) /* {{{ */
 	spl_ce_SplPriorityQueue = register_class_SplPriorityQueue(zend_ce_iterator, zend_ce_countable);
 	spl_ce_SplPriorityQueue->create_object = spl_heap_object_new;
 	spl_ce_SplPriorityQueue->default_object_handlers = &spl_handler_SplPriorityQueue;
-	spl_ce_SplPriorityQueue->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	spl_ce_SplPriorityQueue->get_iterator = spl_pqueue_get_iterator;
 
 	memcpy(&spl_handler_SplPriorityQueue, &std_object_handlers, sizeof(zend_object_handlers));
diff --git a/ext/spl/spl_iterators.c b/ext/spl/spl_iterators.c
@@ -3108,7 +3108,6 @@ PHP_MINIT_FUNCTION(spl_iterators)
 	spl_ce_RecursiveIteratorIterator = register_class_RecursiveIteratorIterator(spl_ce_OuterIterator);
 	spl_ce_RecursiveIteratorIterator->create_object = spl_RecursiveIteratorIterator_new;
 	spl_ce_RecursiveIteratorIterator->default_object_handlers = &spl_handlers_rec_it_it;
-	spl_ce_RecursiveIteratorIterator->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 	spl_ce_RecursiveIteratorIterator->get_iterator = spl_recursive_it_get_iterator;
 
 	memcpy(&spl_handlers_rec_it_it, &std_object_handlers, sizeof(zend_object_handlers));
@@ -3128,7 +3127,6 @@ PHP_MINIT_FUNCTION(spl_iterators)
 	spl_ce_IteratorIterator = register_class_IteratorIterator(spl_ce_OuterIterator);
 	spl_ce_IteratorIterator->create_object = spl_dual_it_new;
 	spl_ce_IteratorIterator->default_object_handlers = &spl_handlers_dual_it;
-	spl_ce_IteratorIterator->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	spl_ce_FilterIterator = register_class_FilterIterator(spl_ce_IteratorIterator);
 	spl_ce_FilterIterator->create_object = spl_dual_it_new;
diff --git a/ext/spl/spl_observer.c b/ext/spl/spl_observer.c
@@ -1379,7 +1379,6 @@ PHP_MINIT_FUNCTION(spl_observer)
 	spl_ce_SplObjectStorage = register_class_SplObjectStorage(zend_ce_countable, spl_ce_SeekableIterator, zend_ce_serializable, zend_ce_arrayaccess);
 	spl_ce_SplObjectStorage->create_object = spl_SplObjectStorage_new;
 	spl_ce_SplObjectStorage->default_object_handlers = &spl_handler_SplObjectStorage;
-	spl_ce_SplObjectStorage->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&spl_handler_SplObjectStorage, &std_object_handlers, sizeof(zend_object_handlers));
 
@@ -1396,7 +1395,6 @@ PHP_MINIT_FUNCTION(spl_observer)
 	spl_ce_MultipleIterator = register_class_MultipleIterator(zend_ce_iterator);
 	spl_ce_MultipleIterator->create_object = spl_SplObjectStorage_new;
 	spl_ce_MultipleIterator->default_object_handlers = &spl_handler_SplObjectStorage;
-	spl_ce_MultipleIterator->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	return SUCCESS;
 }
diff --git a/ext/sqlite3/sqlite3.c b/ext/sqlite3/sqlite3.c
@@ -2411,7 +2411,6 @@ PHP_MINIT_FUNCTION(sqlite3)
 	php_sqlite3_sc_entry = register_class_SQLite3();
 	php_sqlite3_sc_entry->create_object = php_sqlite3_object_new;
 	php_sqlite3_sc_entry->default_object_handlers = &sqlite3_object_handlers;
-	php_sqlite3_sc_entry->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	/* Register SQLite 3 Prepared Statement Class */
 	sqlite3_stmt_object_handlers.offset = XtOffsetOf(php_sqlite3_stmt, zo);
diff --git a/ext/xml/xml.c b/ext/xml/xml.c
@@ -228,7 +228,6 @@ PHP_MINIT_FUNCTION(xml)
 	xml_parser_ce = register_class_XMLParser();
 	xml_parser_ce->create_object = xml_parser_create_object;
 	xml_parser_ce->default_object_handlers = &xml_parser_object_handlers;
-	xml_parser_ce->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 	memcpy(&xml_parser_object_handlers, &std_object_handlers, sizeof(zend_object_handlers));
 	xml_parser_object_handlers.offset = XtOffsetOf(xml_parser, std);
diff --git a/ext/xsl/php_xsl.c b/ext/xsl/php_xsl.c
@@ -278,7 +278,6 @@ PHP_MINIT_FUNCTION(xsl)
 	xsl_xsltprocessor_class_entry = register_class_XSLTProcessor();
 	xsl_xsltprocessor_class_entry->create_object = xsl_objects_new;
 	xsl_xsltprocessor_class_entry->default_object_handlers = &xsl_object_handlers;
-	xsl_xsltprocessor_class_entry->ce_flags |= ZEND_ACC_MAY_BE_CYCLIC;
 
 #ifdef HAVE_XSL_EXSLT
 	exsltRegisterAll();
