diff options
| author | Christopher Jones <sixd@php.net> | 2013-09-26 21:07:57 -0700 |
|---|---|---|
| committer | Christopher Jones <sixd@php.net> | 2013-09-26 21:07:57 -0700 |
| commit | 8554800e7691f85275e650d0b88a3e4d35153e95 (patch) | |
| tree | 285ea30c97e16415100aa81f1b5bb30dc43456cc /Zend/zend_compile.c | |
| parent | eb8e63bd3cfdbd6ad537dbea5f001c0a1995a40d (diff) | |
| parent | 92fe33c57073ab565d94b22e2ee187433c62b28f (diff) | |
| download | php-git-8554800e7691f85275e650d0b88a3e4d35153e95.tar.gz | |
Merge branch 'master' of https://git.php.net/repository/php-src
* 'master' of https://git.php.net/repository/php-src:
Don't track parameter number in separate znode
fix missing change from 'tcp_socket' to the more common 'server'
fix many parallel test issues
Diffstat (limited to 'Zend/zend_compile.c')
| -rw-r--r-- | Zend/zend_compile.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c index 90ff26297a..25a604c440 100644 --- a/Zend/zend_compile.c +++ b/Zend/zend_compile.c @@ -1822,7 +1822,7 @@ void zend_do_end_function_declaration(const znode *function_token TSRMLS_DC) /* } /* }}} */ -void zend_do_receive_arg(zend_uchar op, znode *varname, const znode *offset, const znode *initialization, znode *class_type, zend_uchar pass_by_reference, zend_bool is_variadic TSRMLS_DC) /* {{{ */ +void zend_do_receive_param(zend_uchar op, znode *varname, const znode *initialization, znode *class_type, zend_uchar pass_by_reference, zend_bool is_variadic TSRMLS_DC) /* {{{ */ { zend_op *opline; zend_arg_info *cur_arg_info; @@ -1863,7 +1863,8 @@ void zend_do_receive_arg(zend_uchar op, znode *varname, const znode *offset, con CG(active_op_array)->num_args++; opline->opcode = op; SET_NODE(opline->result, &var); - SET_NODE(opline->op1, offset); + opline->op1_type = IS_UNUSED; + opline->op1.num = CG(active_op_array)->num_args; if (op == ZEND_RECV_INIT) { SET_NODE(opline->op2, initialization); } else { |