mirror of
https://github.com/php/php-src.git
synced 2024-09-22 18:37:25 +00:00
Merge branch 'PHP-8.2'
* PHP-8.2:
Fix Zend/tests/type_declarations/variance/class_order_autoload1.phpt test failre introduced by 44e5c04e55
This commit is contained in:
commit
28be84a146
@ -2362,14 +2362,14 @@ static zend_class_entry* zend_accel_inheritance_cache_add(zend_class_entry *ce,
|
||||
while (entry) {
|
||||
entry = zend_accel_inheritance_cache_find(entry, proto, parent, traits_and_interfaces, &needs_autoload);
|
||||
if (entry) {
|
||||
zend_shared_alloc_unlock();
|
||||
SHM_PROTECT();
|
||||
if (!needs_autoload) {
|
||||
zend_shared_alloc_unlock();
|
||||
SHM_PROTECT();
|
||||
|
||||
zend_map_ptr_extend(ZCSG(map_ptr_last));
|
||||
return entry->ce;
|
||||
} else {
|
||||
return NULL;
|
||||
}
|
||||
ZEND_ASSERT(0); // entry = entry->next; // This shouldn't be possible ???
|
||||
}
|
||||
}
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user