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

Reorder conditions to minimize number of checks on fast path

Browse source
This commit is contained in:
Dmitry Stogov 2019-06-26 01:00:31 +03:00
parent 6288fc19dd
commit f7faa62c43
1 changed files with 30 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

46
Zend/zend_inheritance.c
View file

@ -450,10 +450,12 @@ static inheritance_status zend_do_perform_implementation_check(
local_status = zend_do_perform_arg_type_hint_check( local_status = zend_do_perform_arg_type_hint_check(
unresolved_class, fe, fe_arg_info, proto, proto_arg_info); unresolved_class, fe, fe_arg_info, proto, proto_arg_info);
if (local_status == INHERITANCE_ERROR) {
return INHERITANCE_ERROR; if (UNEXPECTED(local_status != INHERITANCE_SUCCESS)) {
} if (UNEXPECTED(local_status == INHERITANCE_ERROR)) {
if (local_status == INHERITANCE_UNRESOLVED) { return INHERITANCE_ERROR;
}
ZEND_ASSERT(local_status == INHERITANCE_UNRESOLVED);
status = INHERITANCE_UNRESOLVED; status = INHERITANCE_UNRESOLVED;
} }
@ -473,10 +475,12 @@ static inheritance_status zend_do_perform_implementation_check(
local_status = zend_perform_covariant_type_check( local_status = zend_perform_covariant_type_check(
unresolved_class, fe, fe->common.arg_info - 1, proto, proto->common.arg_info - 1); unresolved_class, fe, fe->common.arg_info - 1, proto, proto->common.arg_info - 1);
if (local_status == INHERITANCE_ERROR) {
return INHERITANCE_ERROR; if (UNEXPECTED(local_status != INHERITANCE_SUCCESS)) {
} if (UNEXPECTED(local_status == INHERITANCE_ERROR)) {
if (local_status == INHERITANCE_UNRESOLVED) { return INHERITANCE_ERROR;
}
ZEND_ASSERT(local_status == INHERITANCE_UNRESOLVED);
status = INHERITANCE_UNRESOLVED; status = INHERITANCE_UNRESOLVED;
} }
} }
@ -702,7 +706,8 @@ static void perform_delayable_implementation_check(
if (UNEXPECTED(status != INHERITANCE_SUCCESS)) { if (UNEXPECTED(status != INHERITANCE_SUCCESS)) {
if (EXPECTED(status == INHERITANCE_UNRESOLVED)) { if (EXPECTED(status == INHERITANCE_UNRESOLVED)) {
add_compatibility_obligation(ce, fe, proto, always_error); add_compatibility_obligation(ce, fe, proto, always_error);
} else if (status == INHERITANCE_ERROR) { } else {
ZEND_ASSERT(status == INHERITANCE_ERROR);
if (always_error) { if (always_error) {
emit_incompatible_method_error( emit_incompatible_method_error(
E_COMPILE_ERROR, "must", fe, proto, status, unresolved_class); E_COMPILE_ERROR, "must", fe, proto, status, unresolved_class);
@ -2262,10 +2267,12 @@ static int check_variance_obligation(zval *zv) {
zend_string *unresolved_class; zend_string *unresolved_class;
inheritance_status status = zend_do_perform_implementation_check( inheritance_status status = zend_do_perform_implementation_check(
&unresolved_class, obligation->child_fn, obligation->parent_fn); &unresolved_class, obligation->child_fn, obligation->parent_fn);
if (status == INHERITANCE_UNRESOLVED) {
return ZEND_HASH_APPLY_KEEP; if (UNEXPECTED(status != INHERITANCE_SUCCESS)) {
} if (EXPECTED(status == INHERITANCE_UNRESOLVED)) {
if (status == INHERITANCE_ERROR) { return ZEND_HASH_APPLY_KEEP;
}
ZEND_ASSERT(status == INHERITANCE_ERROR);
emit_incompatible_method_error_or_warning( emit_incompatible_method_error_or_warning(
obligation->child_fn, obligation->parent_fn, status, unresolved_class, obligation->child_fn, obligation->parent_fn, status, unresolved_class,
obligation->always_error); obligation->always_error);
@ -2402,9 +2409,16 @@ zend_bool zend_can_early_bind(zend_class_entry *ce, zend_class_entry *parent_ce)
} }
zv = zend_hash_find_ex(&ce->function_table, key, 1); zv = zend_hash_find_ex(&ce->function_table, key, 1);
if (zv if (zv) {
&& zend_do_perform_implementation_check(&unresolved_class, Z_FUNC_P(zv), parent_func) == INHERITANCE_UNRESOLVED) { zend_function *child_func = Z_FUNC_P(zv);
return 0; inheritance_status status;
status = zend_do_perform_implementation_check(
&unresolved_class, child_func, parent_func);
if (UNEXPECTED(status == INHERITANCE_UNRESOLVED)) {
return 0;
}
} }
} ZEND_HASH_FOREACH_END(); } ZEND_HASH_FOREACH_END();
return 1; return 1;