diff options
| author | Dmitry Stogov <dmitry@zend.com> | 2014-12-22 16:44:39 +0300 |
|---|---|---|
| committer | Dmitry Stogov <dmitry@zend.com> | 2014-12-22 16:44:39 +0300 |
| commit | 2646f7bcb98dcdd322ea21701c8bb101104ea619 (patch) | |
| tree | 6cfa66ba666378de3c59759079e17f3245af0281 /Zend/zend_opcode.c | |
| parent | 2bc63e7b6d348e9210ec09facb4bedb6f4ab921a (diff) | |
| download | php-git-2646f7bcb98dcdd322ea21701c8bb101104ea619.tar.gz | |
Don't count variadic argument in zend_func.common.num_args. This allows faster CALL/RETURN code.
Diffstat (limited to 'Zend/zend_opcode.c')
| -rw-r--r-- | Zend/zend_opcode.c | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c index 82c87c5cd2..fc29e2aadc 100644 --- a/Zend/zend_opcode.c +++ b/Zend/zend_opcode.c @@ -368,7 +368,12 @@ 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) { - for (i=0; i<op_array->num_args; i++) { + uint32_t num_args = op_array->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); |