Merge branch 'PHP-8.2' into PHP-8.3

dstogov · dstogov · commit 5553092d859c · 2023-10-11T09:57:43.000+03:00
* PHP-8.2: Reset inheritance_cache pointer of zend_class_entry upon serialization (#12401)
diff --git a/ext/opcache/zend_file_cache.c b/ext/opcache/zend_file_cache.c
@@ -884,6 +884,8 @@ static void zend_file_cache_serialize_class(zval                     *zv,
 
 	ZEND_MAP_PTR_INIT(ce->static_members_table, NULL);
 	ZEND_MAP_PTR_INIT(ce->mutable_data, NULL);
+
+	ce->inheritance_cache = NULL;
 }
 
 static void zend_file_cache_serialize_warnings(

Original file line number	Diff line number	Diff line change
`@@ -884,6 +884,8 @@ static void zend_file_cache_serialize_class(zval *zv,`
`884`	`884`
`885`	`885`	`ZEND_MAP_PTR_INIT(ce->static_members_table, NULL);`
`886`	`886`	`ZEND_MAP_PTR_INIT(ce->mutable_data, NULL);`
	`887`	`+`
	`888`	`+ ce->inheritance_cache = NULL;`
`887`	`889`	`}`
`888`	`890`
`889`	`891`	`static void zend_file_cache_serialize_warnings(`