php/archived-php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2026-04-13 02:52:48 +02:00
Code Issues Packages Projects Releases Wiki Activity

Fix preloading property type resolution

Browse Source 
This was causing many failures under --preload...
This commit is contained in:
Nikita Popov
2020-07-14 12:59:04 +02:00
parent e5cb53ec68
commit 06162194d6
1 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
ext/opcache/ZendAccelerator.c
View File

@@ -3672,12 +3672,15 @@ static zend_bool preload_try_resolve_property_types(zend_class_entry *ce)
ZEND_HASH_FOREACH_PTR(&ce->properties_info, prop) {
zend_type *single_type;
ZEND_TYPE_FOREACH(prop->type, single_type) {
zend_class_entry *p = preload_fetch_resolved_ce(ZEND_TYPE_NAME(*single_type), ce);
if (!p) {
ok = 0;
continue;
if (ZEND_TYPE_HAS_NAME(*single_type)) {
zend_class_entry *p =
preload_fetch_resolved_ce(ZEND_TYPE_NAME(*single_type), ce);
if (!p) {
ok = 0;
continue;
}
ZEND_TYPE_SET_CE(*single_type, p);
}
ZEND_TYPE_SET_CE(*single_type, p);
} ZEND_TYPE_FOREACH_END();
} ZEND_HASH_FOREACH_END();
}