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

Avoid useless checks for public functions

Browse source
This commit is contained in:
Dmitry Stogov 2018-07-09 17:30:14 +03:00
parent e4be6ce0fa
commit dbb9867b3e
1 changed files with 4 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

10
Zend/zend_object_handlers.c
View file

@ -1273,13 +1273,12 @@ ZEND_API zend_function *zend_std_get_method(zend_object **obj_ptr, zend_string *
fbc = NULL; fbc = NULL;
} }
} }
} else { } else if (fbc->op_array.fn_flags & (ZEND_ACC_CHANGED|ZEND_ACC_PROTECTED)) {
/* Ensure that we haven't overridden a private function and end up calling /* Ensure that we haven't overridden a private function and end up calling
* the overriding public function... * the overriding public function...
*/ */
if (fbc->op_array.fn_flags & (ZEND_ACC_CHANGED|ZEND_ACC_PROTECTED)) {
scope = zend_get_executed_scope(); scope = zend_get_executed_scope();
}
if (fbc->op_array.fn_flags & ZEND_ACC_CHANGED) { if (fbc->op_array.fn_flags & ZEND_ACC_CHANGED) {
if (scope && is_derived_class(fbc->common.scope, scope)) { if (scope && is_derived_class(fbc->common.scope, scope)) {
if ((func = zend_hash_find(&scope->function_table, lc_method_name)) != NULL) { if ((func = zend_hash_find(&scope->function_table, lc_method_name)) != NULL) {
@ -1290,8 +1289,7 @@ ZEND_API zend_function *zend_std_get_method(zend_object **obj_ptr, zend_string *
} }
} }
} }
} } else {
if (fbc->common.fn_flags & ZEND_ACC_PROTECTED) {
/* Ensure that if we're calling a protected function, we're allowed to do so. /* Ensure that if we're calling a protected function, we're allowed to do so.
* If we're not and __call() handler exists, invoke it, otherwise error out. * If we're not and __call() handler exists, invoke it, otherwise error out.
*/ */