summaryrefslogtreecommitdiff
path: root/Zend/zend_execute.c
diff options
context:
space:
mode:
authorNikita Popov <nikic@php.net>2014-02-26 16:25:10 +0100
committerNikita Popov <nikic@php.net>2014-02-26 16:40:25 +0100
commit95c73f99d358f42960cdd536c589244abf35174e (patch)
treefda90a7ed2cf26e145de287eef66a8891a488e4e /Zend/zend_execute.c
parentd3b484df8268f7ab31c4ac39734d4b68ce2e6159 (diff)
downloadphp-git-95c73f99d358f42960cdd536c589244abf35174e.tar.gz
Don't add num_additional_args in SEND opcodes
Now that trailing positional args are disallowed, num_additional_args will always be zero in SEND opcodes (and FUNC_ARG fetches).
Diffstat (limited to 'Zend/zend_execute.c')
-rw-r--r--Zend/zend_execute.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
index 31caceecbe..66accd61e9 100644
--- a/Zend/zend_execute.c
+++ b/Zend/zend_execute.c
@@ -1686,7 +1686,7 @@ ZEND_API zend_execute_data *zend_create_execute_data_from_op_array(zend_op_array
static zend_always_inline zend_bool zend_is_by_ref_func_arg_fetch(zend_op *opline, call_slot *call TSRMLS_DC) /* {{{ */
{
- zend_uint arg_num = (opline->extended_value & ZEND_FETCH_ARG_MASK) + call->num_additional_args;
+ zend_uint arg_num = opline->extended_value & ZEND_FETCH_ARG_MASK;
return ARG_SHOULD_BE_SENT_BY_REF(call->fbc, arg_num);
}
/* }}} */