Skip to content

Commit 28be84a

Browse files
committed
Merge branch 'PHP-8.2'
* PHP-8.2: Fix Zend/tests/type_declarations/variance/class_order_autoload1.phpt test failre introduced by 44e5c04
2 parents c8437ed + dcf2810 commit 28be84a

File tree

1 file changed

+4
-4
lines changed

1 file changed

+4
-4
lines changed

ext/opcache/ZendAccelerator.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2362,14 +2362,14 @@ static zend_class_entry* zend_accel_inheritance_cache_add(zend_class_entry *ce,
23622362
while (entry) {
23632363
entry = zend_accel_inheritance_cache_find(entry, proto, parent, traits_and_interfaces, &needs_autoload);
23642364
if (entry) {
2365+
zend_shared_alloc_unlock();
2366+
SHM_PROTECT();
23652367
if (!needs_autoload) {
2366-
zend_shared_alloc_unlock();
2367-
SHM_PROTECT();
2368-
23692368
zend_map_ptr_extend(ZCSG(map_ptr_last));
23702369
return entry->ce;
2370+
} else {
2371+
return NULL;
23712372
}
2372-
ZEND_ASSERT(0); // entry = entry->next; // This shouldn't be possible ???
23732373
}
23742374
}
23752375

0 commit comments

Comments
 (0)