Clean unfinished calls correctly

Author: iluuu1994

Zend/tests/match/block_003.phpt

@@ -1,6 +1,5 @@
 --TEST--
 Match blocks
---XFAIL--
 --FILE--
 <?php
 

Zend/zend_compile.c

@@ -316,6 +316,7 @@ void zend_oparray_context_begin(zend_oparray_context *prev_context) /* {{{ */
 	CG(context).last_brk_cont = 0;
 	CG(context).brk_cont_array = NULL;
 	CG(context).labels = NULL;
+	CG(context).has_unfinished_calls = false;
 }
 /* }}} */
 
@@ -3991,6 +3992,9 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, zend_fun
 		return true;
 	}
 
+	bool prev_unfinished_calls = CG(context).has_unfinished_calls;
+	CG(context).has_unfinished_calls = true;
+
 	bool may_have_extra_named_args;
 	uint32_t arg_count = zend_compile_args(args_ast, fbc, &may_have_extra_named_args);
 
@@ -4009,6 +4013,7 @@ static bool zend_compile_call_common(znode *result, zend_ast *args_ast, zend_fun
 	}
 	opline->lineno = lineno;
 	zend_do_extended_fcall_end();
+	CG(context).has_unfinished_calls = prev_unfinished_calls;
 	return false;
 }
 /* }}} */
@@ -5175,6 +5180,11 @@ static bool zend_handle_loops_and_finally_ex(zend_long depth, uint32_t excluded_
 	if (!loop_var) {
 		return 1;
 	}
+
+	if (CG(context).has_unfinished_calls) {
+		zend_emit_op(NULL, ZEND_CLEAN_UNFINISHED_CALLS, NULL, NULL);
+	}
+
 	if (depth == -1) {
 		depth = zend_stack_count(&CG(loop_var_stack)) + 1;
 	}

Zend/zend_compile.h

@@ -189,6 +189,8 @@ typedef struct _zend_oparray_context {
 	int        last_brk_cont;
 	zend_brk_cont_element *brk_cont_array;
 	HashTable *labels;
+	/* Whether we're currently evaluating function arguments. */
+	bool       has_unfinished_calls;
 } zend_oparray_context;
 
 /* Class, property and method flags                  class|meth.|prop.|const*/

Zend/zend_vm_def.h

@@ -9548,6 +9548,14 @@ ZEND_VM_HANDLER(202, ZEND_CALLABLE_CONVERT, UNUSED, UNUSED)
 	ZEND_VM_NEXT_OPCODE();
 }
 
+ZEND_VM_HANDLER(204, ZEND_CLEAN_UNFINISHED_CALLS, UNUSED, UNUSED)
+{
+	USE_OPLINE
+	uint32_t opnum = opline - EX(func)->op_array.opcodes;
+	cleanup_unfinished_calls(execute_data, opnum);
+	ZEND_VM_NEXT_OPCODE();
+}
+
 ZEND_VM_HOT_TYPE_SPEC_HANDLER(ZEND_JMP, (OP_JMP_ADDR(op, op->op1) > op), ZEND_JMP_FORWARD, JMP_ADDR, ANY)
 {
 	USE_OPLINE