Merge branch 'PHP-7.0'

laruence · laruence · commit d0e3ce73f067 · 2016-01-03T14:07:13.000+08:00
diff --git a/Zend/zend_opcode.c b/Zend/zend_opcode.c
@@ -419,9 +419,8 @@ ZEND_API void destroy_op_array(zend_op_array *op_array)
 		}
 	}
 	if (op_array->arg_info) {
-		int32_t num_args = op_array->num_args;
+		uint32_t num_args = op_array->num_args;
 		zend_arg_info *arg_info = op_array->arg_info;
-		int32_t i;
 
 		if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {
 			arg_info--;

Original file line number	Diff line number	Diff line change
`@@ -419,9 +419,8 @@ ZEND_API void destroy_op_array(zend_op_array *op_array)`
`419`	`419`	`}`
`420`	`420`	`}`
`421`	`421`	`if (op_array->arg_info) {`
`422`		`- int32_t num_args = op_array->num_args;`
	`422`	`+ uint32_t num_args = op_array->num_args;`
`423`	`423`	`zend_arg_info *arg_info = op_array->arg_info;`
`424`		`- int32_t i;`
`425`	`424`
`426`	`425`	`if (op_array->fn_flags & ZEND_ACC_HAS_RETURN_TYPE) {`
`427`	`426`	`arg_info--;`