Fix OpCache not recursively storing in persistent memory sub intersection types

Girgias · Girgias · commit ec35a112298b · 2022-06-11T16:16:53.000+01:00
diff --git a/Zend/tests/type_declarations/dnf_types/variance/valid8.phpt b/Zend/tests/type_declarations/dnf_types/variance/valid8.phpt
@@ -1,7 +1,5 @@
 --TEST--
 Covariant replacement of iterable type with intersection type in DNF type
---XFAIL--
-Issue with delayed variance
 --FILE--
 <?php
 
diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
@@ -379,6 +379,10 @@ static void zend_persist_type(zend_type *type) {
 
 	zend_type *single_type;
 	ZEND_TYPE_FOREACH(*type, single_type) {
+		if (ZEND_TYPE_HAS_LIST(*single_type)) {
+			zend_persist_type(single_type);
+			continue;
+		}
 		if (ZEND_TYPE_HAS_NAME(*single_type)) {
 			zend_string *type_name = ZEND_TYPE_NAME(*single_type);
 			zend_accel_store_interned_string(type_name);
diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
@@ -187,6 +187,10 @@ static void zend_persist_type_calc(zend_type *type)
 
 	zend_type *single_type;
 	ZEND_TYPE_FOREACH(*type, single_type) {
+		if (ZEND_TYPE_HAS_LIST(*single_type)) {
+			zend_persist_type_calc(single_type);
+			continue;
+		}
 		if (ZEND_TYPE_HAS_NAME(*single_type)) {
 			zend_string *type_name = ZEND_TYPE_NAME(*single_type);
 			ADD_INTERNED_STRING(type_name);

-Original file line number
+Diff line change
@@ @@ -1,7 +1,5 @@ @@
 --TEST--
 Covariant replacement of iterable type with intersection type in DNF type
 ---XFAIL--
 -Issue with delayed variance
 --FILE--
 <?php