diff options
| author | Xinchen Hui <laruence@php.net> | 2015-01-29 00:01:24 +0800 |
|---|---|---|
| committer | Xinchen Hui <laruence@php.net> | 2015-01-29 00:01:24 +0800 |
| commit | 659395e3dd41cd6013d27b0bd13284f2fedd94d3 (patch) | |
| tree | 2cfe5784562f1336a9a54e74469a60020cae0a10 /Zend/zend_opcode.c | |
| parent | f2f98e51e1c886e162aca0442f77599f19272b55 (diff) | |
| parent | 4d1693744996f78618da768114a2b225fe4fd503 (diff) | |
| download | php-git-659395e3dd41cd6013d27b0bd13284f2fedd94d3.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 25 |
1 files changed, 19 insertions, 6 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index aa2abb2f6b..a6d041f131 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -367,18 +367,26 @@ ZEND_API void destroy_op_array(zend_op_array *op_array) zend_llist_apply_with_argument(&zend_extensions, (llist_apply_with_arg_func_t) zend_extension_op_array_dtor_handler, op_array); } if (op_array->arg_info) { - uint32_t num_args = op_array->num_args; + int32_t num_args = op_array->num_args; + zend_arg_info *arg_info = op_array->arg_info; + int32_t i; + if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) { + arg_info--; + num_args++; + } if (op_array->fn_flags & ZEND_ACC_VARIADIC) { num_args++; } - for (i = 0; i < num_args; i++) { - zend_string_release(op_array->arg_info[i].name); - if (op_array->arg_info[i].class_name) { - zend_string_release(op_array->arg_info[i].class_name); + for (i = 0 ; i < num_args; i++) { + if (arg_info[i].name) { + zend_string_release(arg_info[i].name); + } + if (arg_info[i].class_name) { + zend_string_release(arg_info[i].class_name); } } - efree(op_array->arg_info); + efree(arg_info); } } @@ -762,6 +770,11 @@ ZEND_API int pass_two(zend_op_array *op_array) case ZEND_FE_FETCH: ZEND_PASS_TWO_UPDATE_JMP_TARGET(op_array, opline, opline->op2); break; + case ZEND_VERIFY_RETURN_TYPE: + if (op_array->fn_flags & ZEND_ACC_GENERATOR) { + MAKE_NOP(opline); + } + break; case ZEND_RETURN: case ZEND_RETURN_BY_REF: if (op_array->fn_flags & ZEND_ACC_GENERATOR) { |