Use consumed_args for array_reduce and callback hot paths

Author: drealecs

Zend/zend_API.h

@@ -340,6 +340,7 @@ typedef struct _zend_fcall_info_cache {
 
 #define ZEND_FCI_INITIALIZED(fci) ((fci).size != 0)
 #define ZEND_FCC_INITIALIZED(fcc) ((fcc).function_handler != NULL)
+#define ZEND_FCI_CONSUMED_ARG(arg_num) (1u << ((arg_num) - 1))
 
 ZEND_API int zend_next_free_module(void);
 

ext/pcre/php_pcre.c

@@ -1570,6 +1570,7 @@ static zend_string *preg_do_repl_func(zend_fcall_info *fci, zend_fcall_info_cach
 	fci->retval = &retval;
 	fci->param_count = 1;
 	fci->params = &arg;
+	fci->consumed_args = ZEND_FCI_CONSUMED_ARG(1);
 	zend_call_function(fci, fcc);
 	zval_ptr_dtor(&arg);
 	if (EXPECTED(Z_TYPE(retval) == IS_STRING)) {

ext/standard/array.c

@@ -1386,6 +1386,7 @@ static zend_result php_array_walk(
 	fci.retval = &retval;
 	fci.param_count = userdata ? 3 : 2;
 	fci.params = args;
+	fci.consumed_args = ZEND_FCI_CONSUMED_ARG(2);
 
 	zend_hash_internal_pointer_reset_ex(target_hash, &pos);
 	ht_iter = zend_hash_iterator_add(target_hash, pos);
@@ -6409,6 +6410,7 @@ PHP_FUNCTION(array_reduce)
 	fci.retval = return_value;
 	fci.param_count = 2;
 	fci.params = args;
+	fci.consumed_args = ZEND_FCI_CONSUMED_ARG(1);
 
 	ZEND_HASH_FOREACH_VAL(htbl, operand) {
 		ZVAL_COPY_VALUE(&args[0], return_value);

main/output.c

@@ -972,6 +972,7 @@ static inline php_output_handler_status_t php_output_handler_op(php_output_handl
 			handler->func.user->fci.param_count = 2;
 			handler->func.user->fci.params = ob_args;
 			handler->func.user->fci.retval = &retval;
+			handler->func.user->fci.consumed_args = ZEND_FCI_CONSUMED_ARG(1);
 
 			if (SUCCESS == zend_call_function(&handler->func.user->fci, &handler->func.user->fcc) && Z_TYPE(retval) != IS_UNDEF) {
 				if (handler->flags & PHP_OUTPUT_HANDLER_PRODUCED_OUTPUT) {