Merge branch 'PHP-8.1' into PHP-8.2

dstogov · dstogov · commit 310b5283eb10 · 2023-10-11T09:57:35.000+03:00
* PHP-8.1: 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
@@ -882,6 +882,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
`@@ -882,6 +882,8 @@ static void zend_file_cache_serialize_class(zval *zv,`
`882`	`882`
`883`	`883`	`ZEND_MAP_PTR_INIT(ce->static_members_table, NULL);`
`884`	`884`	`ZEND_MAP_PTR_INIT(ce->mutable_data, NULL);`
	`885`	`+`
	`886`	`+ ce->inheritance_cache = NULL;`
`885`	`887`	`}`
`886`	`888`
`887`	`889`	`static void zend_file_cache_serialize_warnings(`