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

Record warnings during early binding

Browse source 
These should also get replayed when the class is loaded from
opcache.
This commit is contained in:
Nikita Popov 2021-05-17 10:18:26 +02:00
parent 3b7edb6587
commit f0858d891f
1 changed files with 5 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

5
Zend/zend_inheritance.c
View file

@ -2960,6 +2960,10 @@ zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *pa
orig_linking_class = CG(current_linking_class); orig_linking_class = CG(current_linking_class);
CG(current_linking_class) = is_cacheable ? ce : NULL; CG(current_linking_class) = is_cacheable ? ce : NULL;
if (is_cacheable) {
zend_begin_record_errors();
}
zend_do_inheritance_ex(ce, parent_ce, status == INHERITANCE_SUCCESS); zend_do_inheritance_ex(ce, parent_ce, status == INHERITANCE_SUCCESS);
if (parent_ce && parent_ce->num_interfaces) { if (parent_ce && parent_ce->num_interfaces) {
zend_do_inherit_interfaces(ce, parent_ce); zend_do_inherit_interfaces(ce, parent_ce);
@ -2972,6 +2976,7 @@ zend_class_entry *zend_try_early_bind(zend_class_entry *ce, zend_class_entry *pa
ce->ce_flags |= ZEND_ACC_LINKED; ce->ce_flags |= ZEND_ACC_LINKED;
CG(current_linking_class) = orig_linking_class; CG(current_linking_class) = orig_linking_class;
EG(record_errors) = false;
if (is_cacheable) { if (is_cacheable) {
HashTable *ht = (HashTable*)ce->inheritance_cache; HashTable *ht = (HashTable*)ce->inheritance_cache;