Merge branch 'PHP-7.0'

laruence · laruence · commit 2d750a7233f0 · 2015-11-10T16:01:14.000+08:00
diff --git a/Zend/zend_execute.c b/Zend/zend_execute.c
@@ -2420,7 +2420,6 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut
 
 static void cleanup_unfinished_calls(zend_execute_data *execute_data, uint32_t op_num) /* {{{ */
 {
-	int i;
 	if (UNEXPECTED(EX(call))) {
 		zend_execute_data *call = EX(call);
 		zend_op *opline = EX(func)->op_array.opcodes + op_num;

Original file line number	Diff line number	Diff line change
`@@ -2420,7 +2420,6 @@ static zend_always_inline zend_generator *zend_get_running_generator(zend_execut`
`2420`	`2420`
`2421`	`2421`	`static void cleanup_unfinished_calls(zend_execute_data execute_data, uint32_t op_num) / {{{ */`
`2422`	`2422`	`{`
`2423`		`- int i;`
`2424`	`2423`	`if (UNEXPECTED(EX(call))) {`
`2425`	`2424`	`zend_execute_data *call = EX(call);`
`2426`	`2425`	`zend_op *opline = EX(func)->op_array.opcodes + op_num;`