archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-16 22:18:50 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

properties_info_table may be in arena or shm

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

Related to bug #77615.
This commit is contained in:
Nikita Popov 2019-02-15 10:26:46 +01:00
parent c62e106610
commit ffc7e953ea
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

4
ext/opcache/tests/preload.inc
View file

@ -37,3 +37,7 @@ trait T2 {
class Y { class Y {
use T2; use T2;
} }
class Z {
public $foo;
}

10
ext/opcache/zend_persist.c
View file

@ -874,9 +874,13 @@ static void zend_persist_class_entry(zval *zv)
int i; int i;
size_t size = sizeof(zend_property_info *) * ce->default_properties_count; size_t size = sizeof(zend_property_info *) * ce->default_properties_count;
memcpy(ZCG(arena_mem), ce->properties_info_table, size); if (ZCG(is_immutable_class)) {
ce->properties_info_table = ZCG(arena_mem); ce->properties_info_table = zend_shared_memdup_put(
ZCG(arena_mem) = (void*)((char*)ZCG(arena_mem) + ZEND_ALIGNED_SIZE(size)); 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++) { 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]); ce->properties_info_table[i] = zend_shared_alloc_get_xlat_entry(ce->properties_info_table[i]);

2
ext/opcache/zend_persist_calc.c
View file

@ -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); zend_hash_persist_calc(&ce->properties_info, zend_persist_property_info_calc);
if (ce->properties_info_table) { 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) { if (ce->num_interfaces) {