fix(zend, opcache): use a property flag to identify generic clones

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

Author: azjezz

Zend/zend_compile.h

@@ -332,7 +332,7 @@ typedef struct _zend_oparray_context {
 /* has #[\Override] attribute                             |     |     |     */
 #define ZEND_ACC_OVERRIDE                (1 << 28) /*     |  X  |  X  |     */
 /*                                                        |     |     |     */
-/* Property Flags (unused: 13-27,29...)                   |     |     |     */
+/* Property Flags (unused: 14-27,29...)                   |     |     |     */
 /* ===========                                            |     |     |     */
 /*                                                        |     |     |     */
 /* Promoted property / parameter                          |     |     |     */
@@ -346,6 +346,9 @@ typedef struct _zend_oparray_context {
 #define ZEND_ACC_PROTECTED_SET           (1 << 11) /*     |     |  X  |     */
 #define ZEND_ACC_PRIVATE_SET             (1 << 12) /*     |     |  X  |     */
 /*                                                        |     |     |     */
+/* Parametric LSP substitution clone owned by a child     |     |     |     */
+#define ZEND_ACC_GENERIC_CLONE           (1 << 13) /*     |     |  X  |     */
+/*                                                        |     |     |     */
 /* Class Flags (unused: 31)                               |     |     |     */
 /* ===========                                            |     |     |     */
 /*                                                        |     |     |     */

Zend/zend_inheritance.c

@@ -1920,6 +1920,7 @@ static void do_inherit_property(zend_property_info *parent_info, zend_string *ke
 					if (!ZEND_TYPE_HAS_TYPE_PARAMETER(sub)) {
 						zend_property_info *clone = zend_arena_alloc(&CG(arena), sizeof(*clone));
 						*clone = *parent_info;
+						clone->flags |= ZEND_ACC_GENERIC_CLONE;
 						clone->type = sub;
 						zend_type_copy_ctor(&clone->type, /* use_arena */ true, /* persistent */ false);
 

ext/opcache/zend_persist.c

@@ -1211,7 +1211,7 @@ zend_class_entry *zend_persist_class_entry(zend_class_entry *orig_ce)
 				zend_property_info *xlat_prop = zend_shared_alloc_get_xlat_entry(prop);
 				if (xlat_prop) {
 					Z_PTR(p->val) = xlat_prop;
-				} else if (!zend_accel_in_shm(prop) && prop->ce->type == ZEND_USER_CLASS) {
+				} else if (prop->flags & ZEND_ACC_GENERIC_CLONE) {
 					Z_PTR(p->val) = zend_persist_substituted_property_info(prop);
 				} else {
 					/* This can happen if preloading is used and we inherit a property from an

ext/opcache/zend_persist_calc.c

@@ -662,7 +662,7 @@ void zend_persist_class_entry_calc(zend_class_entry *ce)
 			ADD_INTERNED_STRING(p->key);
 			if (prop->ce == ce) {
 				zend_persist_property_info_calc(prop);
-			} else if (!zend_accel_in_shm(prop) && prop->ce->type == ZEND_USER_CLASS && !zend_shared_alloc_get_xlat_entry(prop)) {
+			} else if ((prop->flags & ZEND_ACC_GENERIC_CLONE) && !zend_shared_alloc_get_xlat_entry(prop)) {
 				zend_shared_alloc_register_xlat_entry(prop, prop);
 				zend_persist_substituted_property_info_calc(prop);
 			}