mirrors/php-src
0
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-11-28 12:26:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Cleanup
This commit is contained in:
Dmitry Stogov 2019-06-25 16:53:46 +03:00
commit c6ce159384
1 changed files with 23 additions and 38 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

61
Zend/zend_inheritance.c
View File

@ -488,16 +488,6 @@ static inheritance_status zend_do_perform_implementation_check(
}
/* }}} */
static inheritance_status perform_delayable_implementation_check(
zend_string **unresolved_class, zend_class_entry *ce,
const zend_function *fe, const zend_function *proto) {
inheritance_status status = zend_do_perform_implementation_check(unresolved_class, fe, proto);
if (status == INHERITANCE_UNRESOLVED) {
add_compatibility_obligation(ce, fe, proto);
}
return status;
}
static ZEND_COLD void zend_append_type_hint(smart_str *str, const zend_function *fptr, zend_arg_info *arg_info, int return_hint) /* {{{ */
{
@ -681,12 +671,28 @@ static void ZEND_COLD emit_incompatible_method_error(
zend_string_efree(parent_prototype);
}
static void perform_delayable_implementation_check(
zend_class_entry *ce, const zend_function *fe,
const zend_function *proto)
{
zend_string *unresolved_class;
inheritance_status status = zend_do_perform_implementation_check(
&unresolved_class, fe, proto);
if (UNEXPECTED(status != INHERITANCE_SUCCESS)) {
if (EXPECTED(status == INHERITANCE_UNRESOLVED)) {
add_compatibility_obligation(ce, fe, proto);
} else if (status == INHERITANCE_ERROR) {
emit_incompatible_method_error(
fe, proto, status, unresolved_class);
}
}
}
static void do_inheritance_check_on_method(zend_function *child, zend_function *parent, zend_class_entry *ce, zval *child_zv) /* {{{ */
{
uint32_t child_flags;
uint32_t parent_flags = parent->common.fn_flags;
inheritance_status status;
zend_string *unresolved_class;
if (UNEXPECTED(parent_flags & ZEND_ACC_FINAL)) {
zend_error_at_noreturn(E_COMPILE_ERROR, NULL, func_lineno(child),
@ -765,10 +771,7 @@ static void do_inheritance_check_on_method(zend_function *child, zend_function *
ZEND_FN_SCOPE_NAME(child), ZSTR_VAL(child->common.function_name), zend_visibility_string(parent_flags), ZEND_FN_SCOPE_NAME(parent), (parent_flags&ZEND_ACC_PUBLIC) ? "" : " or weaker");
}
status = perform_delayable_implementation_check(&unresolved_class, ce, child, parent);
if (status == INHERITANCE_ERROR) {
emit_incompatible_method_error(child, parent, status, unresolved_class);
}
perform_delayable_implementation_check(ce, child, parent);
}
} while (0);
}
@ -1466,8 +1469,6 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
{
zend_function *existing_fn = NULL;
zend_function *new_fn;
zend_string *unresolved_class;
inheritance_status status;
if ((existing_fn = zend_hash_find_ptr(&ce->function_table, key)) != NULL) {
/* if it is the same function with the same visibility and has not been assigned a class scope yet, regardless
@ -1485,21 +1486,11 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
if ((existing_fn = zend_hash_find_ptr(*overridden, key)) != NULL) {
if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
/* Make sure the trait method is compatible with previosly declared abstract method */
status = perform_delayable_implementation_check(
&unresolved_class, ce, fn, existing_fn);
if (status == INHERITANCE_ERROR) {
emit_incompatible_method_error(
fn, existing_fn, status, unresolved_class);
}
perform_delayable_implementation_check(ce, fn, existing_fn);
}
if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
/* Make sure the abstract declaration is compatible with previous declaration */
status = perform_delayable_implementation_check(
&unresolved_class, ce, existing_fn, fn);
if (status == INHERITANCE_ERROR) {
emit_incompatible_method_error(
existing_fn, fn, status, unresolved_class);
}
perform_delayable_implementation_check(ce, existing_fn, fn);
return;
}
}
@ -1512,16 +1503,10 @@ static void zend_add_trait_method(zend_class_entry *ce, const char *name, zend_s
} else if (existing_fn->common.fn_flags & ZEND_ACC_ABSTRACT &&
(existing_fn->common.scope->ce_flags & ZEND_ACC_INTERFACE) == 0) {
/* Make sure the trait method is compatible with previosly declared abstract method */
status = perform_delayable_implementation_check(&unresolved_class, ce, fn, existing_fn);
if (status == INHERITANCE_ERROR) {
emit_incompatible_method_error(fn, existing_fn, status, unresolved_class);
}
perform_delayable_implementation_check(ce, fn, existing_fn);
} else if (fn->common.fn_flags & ZEND_ACC_ABSTRACT) {
/* Make sure the abstract declaration is compatible with previous declaration */
status = perform_delayable_implementation_check(&unresolved_class, ce, existing_fn, fn);
if (status == INHERITANCE_ERROR) {
emit_incompatible_method_error(existing_fn, fn, status, unresolved_class);
}
perform_delayable_implementation_check(ce, existing_fn, fn);
return;
} else if (UNEXPECTED(existing_fn->common.scope->ce_flags & ZEND_ACC_TRAIT)) {
/* two traits can't define the same non-abstract method */