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-7.4'

Browse source 
* PHP-7.4:
  Prevent useless hash lookups
  Update NEWS for 7.4.0alpha3
  Update NEWS for PHP 7.4.0alpha2
This commit is contained in:
Dmitry Stogov 2019-06-25 12:42:36 +03:00
commit 83c2e6787d
1 changed files with 8 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

13
Zend/zend_inheritance.c
View file

@ -2328,14 +2328,17 @@ zend_bool zend_can_early_bind(zend_class_entry *ce, zend_class_entry *parent_ce)
zend_function *parent_func; zend_function *parent_func;
ZEND_HASH_FOREACH_STR_KEY_PTR(&parent_ce->function_table, key, parent_func) { ZEND_HASH_FOREACH_STR_KEY_PTR(&parent_ce->function_table, key, parent_func) {
uint32_t parent_flags = parent_func->common.fn_flags; uint32_t parent_flags = parent_func->common.fn_flags;
zend_function *func = zend_hash_find_ptr(&ce->function_table, key); zval *zv;
zend_string *unresolved_class; zend_string *unresolved_class;
if (!func || (parent_flags & ZEND_ACC_PRIVATE) ||
((parent_flags & ZEND_ACC_CTOR) && !(parent_flags & ZEND_ACC_ABSTRACT)) if ((parent_flags & ZEND_ACC_PRIVATE) ||
) { ((parent_flags & ZEND_ACC_CTOR) && !(parent_flags & ZEND_ACC_ABSTRACT))) {
continue; continue;
} }
if (zend_do_perform_implementation_check(&unresolved_class, func, parent_func) == INHERITANCE_UNRESOLVED) {
zv = zend_hash_find_ex(&ce->function_table, key, 1);
if (zv
&& zend_do_perform_implementation_check(&unresolved_class, Z_FUNC_P(zv), parent_func) == INHERITANCE_UNRESOLVED) {
return 0; return 0;
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();