- Fix problem where function parameter fetches were created too late.

diff --git a/Zend/zend_compile.c b/Zend/zend_compile.c
index 732ea0dc7362e56e2211e09bfeb9ed98741ef039..7863dd65eeb682ccdf04acca02debc481576fcea 100644 (file)
--- a/Zend/zend_compile.c
+++ b/Zend/zend_compile.c
@@ -831,7 +831,7 @@ void do_end_function_call(znode *function_name, znode *result, znode *argument_l
 
 void do_pass_param(znode *param, int op, int offset CLS_DC)
 {
-       zend_op *opline = get_next_op(CG(active_op_array) CLS_CC);
+       zend_op *opline;
        unsigned char *arg_types;
        int original_op=op;
        zend_function **function_ptr_ptr, *function_ptr;
@@ -840,10 +840,8 @@ void do_pass_param(znode *param, int op, int offset CLS_DC)
        function_ptr = *function_ptr_ptr;
        if (function_ptr) {
                arg_types = function_ptr->common.arg_types;
-               opline->extended_value = ZEND_DO_FCALL;
        } else {
                arg_types = NULL;
-               opline->extended_value = ZEND_DO_FCALL_BY_NAME;
        }
 
        if (op == ZEND_SEND_VAL) {
@@ -885,6 +883,12 @@ void do_pass_param(znode *param, int op, int offset CLS_DC)
                }
        }
 
+       opline = get_next_op(CG(active_op_array) CLS_CC);
+       if (function_ptr) {
+               opline->extended_value = ZEND_DO_FCALL;
+       } else {
+               opline->extended_value = ZEND_DO_FCALL_BY_NAME;
+       }
        opline->opcode = op;
        opline->op1 = *param;
        opline->op2.u.opline_num = offset;