properties_info_table may be in arena or shm

For immutable classes it should be shm instead of in arena.

Related to bug #77615.

diff --git a/ext/opcache/tests/preload.inc b/ext/opcache/tests/preload.inc
index af20c4947f8a7fb0058219c34501a07fd6401091..0e09ad366c3191206cddffd6da2965492f1d89e0 100644 (file)
--- a/ext/opcache/tests/preload.inc
+++ b/ext/opcache/tests/preload.inc
@@ -37,3 +37,7 @@ trait T2 {
 class Y {
        use T2;
 }
+
+class Z {
+    public $foo;
+}

diff --git a/ext/opcache/zend_persist.c b/ext/opcache/zend_persist.c
index 188c31ea3140339df5eedbf29f23cfc1d3edcdc8..d22b855f5889ab4e5bc3cea80d06bed9dad1136c 100644 (file)
--- a/ext/opcache/zend_persist.c
+++ b/ext/opcache/zend_persist.c
@@ -874,9 +874,13 @@ static void zend_persist_class_entry(zval *zv)
                        int i;
 
                        size_t size = sizeof(zend_property_info *) * ce->default_properties_count;
-                       memcpy(ZCG(arena_mem), ce->properties_info_table, size);
-                       ce->properties_info_table = ZCG(arena_mem);
-                       ZCG(arena_mem) = (void*)((char*)ZCG(arena_mem) + ZEND_ALIGNED_SIZE(size));
+                       if (ZCG(is_immutable_class)) {
+                               ce->properties_info_table = zend_shared_memdup_put(
+                                       ce->properties_info_table, size);
+                       } else {
+                               ce->properties_info_table = zend_shared_memdup_arena_put(
+                                       ce->properties_info_table, size);
+                       }
 
                        for (i = 0; i < ce->default_properties_count; i++) {
                                ce->properties_info_table[i] = zend_shared_alloc_get_xlat_entry(ce->properties_info_table[i]);

diff --git a/ext/opcache/zend_persist_calc.c b/ext/opcache/zend_persist_calc.c
index 21f6d45b5b259b67b68d095cfe0c594a9a78c598..7daac7b51cf0a7c5418e76664335204c7861f405 100644 (file)
--- a/ext/opcache/zend_persist_calc.c
+++ b/ext/opcache/zend_persist_calc.c
@@ -388,7 +388,7 @@ static void zend_persist_class_entry_calc(zval *zv)
                zend_hash_persist_calc(&ce->properties_info, zend_persist_property_info_calc);
 
                if (ce->properties_info_table) {
-                       ADD_ARENA_SIZE(sizeof(zend_property_info *) * ce->default_properties_count);
+                       ADD_SIZE_EX(sizeof(zend_property_info *) * ce->default_properties_count);
                }
 
                if (ce->num_interfaces) {