archive/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2025-08-15 21:48:51 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Merge branch 'PHP-8.2'

Browse source
This commit is contained in:
Bob Weinand 2022-11-02 15:33:17 +01:00
commit 98646e3e21
3 changed files with 40 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_inheritance.c
View file

@ -3136,13 +3136,11 @@ static zend_always_inline bool register_early_bound_ce(zval *delayed_early_bindi
if (EXPECTED(!(ce->ce_flags & ZEND_ACC_PRELOADED))) {
if (zend_hash_set_bucket_key(EG(class_table), (Bucket *)delayed_early_binding, lcname) != NULL) {
Z_CE_P(delayed_early_binding) = ce;
zend_observer_class_linked_notify(ce, lcname);
return true;
}
} else {
/* If preloading is used, don't replace the existing bucket, add a new one. */
if (zend_hash_add_ptr(EG(class_table), lcname, ce) != NULL) {
zend_observer_class_linked_notify(ce, lcname);
return true;
}
}
@ -3150,7 +3148,6 @@ static zend_always_inline bool register_early_bound_ce(zval *delayed_early_bindi
return false;
}
if (zend_hash_add_ptr(CG(class_table), lcname, ce) != NULL) {
zend_observer_class_linked_notify(ce, lcname);
return true;
}
return false;
@ -3171,6 +3168,7 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
if (UNEXPECTED(!register_early_bound_ce(delayed_early_binding, lcname, ret))) {
return NULL;
}
zend_observer_class_linked_notify(ret, lcname);
return ret;
}
} else {
@ -3245,6 +3243,7 @@ ZEND_API zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_
if (ZSTR_HAS_CE_CACHE(ce->name)) {
ZSTR_SET_CE_CACHE(ce->name, ce);
}
zend_observer_class_linked_notify(ce, lcname);
return ce;
}