fix(zend, opcache): track generic_type_table persistence with explicit flag

Signed-off-by: azjezz <azjezz@protonmail.com>

Author: azjezz

Zend/zend_compile.h

@@ -161,6 +161,7 @@ typedef struct _zend_generic_type_table {
 	HashTable   *implements;        /* implements index -> zend_type * */
 	HashTable   *trait_uses;        /* trait-use index -> zend_type * */
 	HashTable   *turbofish_args;    /* opline->extended_value -> zend_type * (NAMED_WITH_ARGS holding the call-site type arguments); index is stable across optimizer reorderings */
+	bool         persisted;         /* set by opcache when the table lives in SHM/file-cache memory; suppresses destruction */
 } zend_generic_type_table;
 
 /* Compile-time linked stack of in-scope generic type parameters. */

Zend/zend_opcode.c

@@ -185,22 +185,7 @@ ZEND_API zend_generic_type_table *zend_generic_type_table_alloc(void) {
 }
 
 ZEND_API void zend_generic_type_table_destroy(zend_generic_type_table *table) {
-	if (!table) {
-		return;
-	}
-
-	bool persisted = false;
-#define MAYBE_PERSISTED(ht) ((ht) && (GC_FLAGS(ht) & IS_ARRAY_IMMUTABLE))
-	if (MAYBE_PERSISTED(table->parameters)
-	  || MAYBE_PERSISTED(table->properties)
-	  || MAYBE_PERSISTED(table->class_constants)
-	  || MAYBE_PERSISTED(table->implements)
-	  || MAYBE_PERSISTED(table->trait_uses)
-	  || MAYBE_PERSISTED(table->turbofish_args)) {
-		persisted = true;
-	}
-#undef MAYBE_PERSISTED
-	if (persisted) {
+	if (!table || table->persisted) {
 		return;
 	}
 

ext/opcache/zend_persist.c

@@ -480,6 +480,7 @@ static zend_generic_type_table *zend_persist_generic_type_table(zend_generic_typ
 	}
 
 	zend_generic_type_table *persisted = zend_shared_memdup_put_free(table, sizeof(*table));
+	persisted->persisted = true;
 	if (persisted->return_type) {
 		persisted->return_type = zend_shared_memdup_put_free(persisted->return_type, sizeof(zend_type));
 		zend_persist_type(persisted->return_type);