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

Remove duplicated code (keep destroy_zend_function() for compatibility)

Browse Source
This commit is contained in:
Dmitry Stogov 2018-06-27 14:54:42 +03:00
parent 56450c6e65
commit 716bbd3480
3 changed files with 5 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
Zend/zend_opcode.c
View File

@ -97,30 +97,10 @@ void init_op_array(zend_op_array *op_array, zend_uchar type, int initial_ops_siz
ZEND_API void destroy_zend_function(zend_function *function) ZEND_API void destroy_zend_function(zend_function *function)
{ {
if (function->type == ZEND_USER_FUNCTION) { zval tmp;
destroy_op_array(&function->op_array);
} else {
ZEND_ASSERT(function->type == ZEND_INTERNAL_FUNCTION);
ZEND_ASSERT(function->common.function_name);
zend_string_release_ex(function->common.function_name, 1);
if (function->common.arg_info && ZVAL_PTR(&tmp, function);
(function->common.fn_flags & (ZEND_ACC_HAS_RETURN_TYPE|ZEND_ACC_HAS_TYPE_HINTS))) { zend_function_dtor(&tmp);
uint32_t i;
uint32_t num_args = function->common.num_args + 1;
zend_arg_info *arg_info = function->common.arg_info - 1;
if (function->common.fn_flags & ZEND_ACC_VARIADIC) {
num_args++;
}
for (i = 0 ; i < num_args; i++) {
if (ZEND_TYPE_IS_CLASS(arg_info[i].type)) {
zend_string_release_ex(ZEND_TYPE_NAME(arg_info[i].type), 1);
}
}
free(arg_info);
}
}
} }
ZEND_API void zend_function_dtor(zval *zv) ZEND_API void zend_function_dtor(zval *zv)

2
ext/opcache/zend_accelerator_util_funcs.c
View File

@ -55,7 +55,7 @@ static void zend_accel_destroy_zend_function(zval *zv)
} }
} }
destroy_zend_function(function); zend_function_dtor(zv);
} }
static void zend_accel_destroy_zend_class(zval *zv) static void zend_accel_destroy_zend_class(zval *zv)

3
sapi/phpdbg/phpdbg.c
View File

@ -121,8 +121,7 @@ static void php_phpdbg_destroy_bp_condition(zval *data) /* {{{ */
static void php_phpdbg_destroy_registered(zval *data) /* {{{ */ static void php_phpdbg_destroy_registered(zval *data) /* {{{ */
{ {
zend_function *function = (zend_function *) Z_PTR_P(data); zend_function_dtor(data);
destroy_zend_function(function);
} /* }}} */ } /* }}} */
static void php_phpdbg_destroy_file_source(zval *data) /* {{{ */ static void php_phpdbg_destroy_file_source(zval *data) /* {{{ */