Remove zend_fcall_info_call() API

The last parameter which is named zval *args, does NOT set the FCI params field.
It is expected to be a PHP array which gets looped over to set the arguments which is also a zval pointer...

Since PHP 8.0, the named_params field is a more appropriate way of doing this.

Also remove zend_fcall_info_args_save() and zend_fcall_info_args_restore() as they were only used in the implementation of zend_fcall_info_call()

Author: Girgias

Zend/zend_API.c

@@ -4136,23 +4136,6 @@ ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, bool free_mem) /*
 }
 /* }}} */
 
-ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, uint32_t *param_count, zval **params) /* {{{ */
-{
-	*param_count = fci->param_count;
-	*params = fci->params;
-	fci->param_count = 0;
-	fci->params = NULL;
-}
-/* }}} */
-
-ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, uint32_t param_count, zval *params) /* {{{ */
-{
-	zend_fcall_info_args_clear(fci, 1);
-	fci->param_count = param_count;
-	fci->params = params;
-}
-/* }}} */
-
 ZEND_API zend_result zend_fcall_info_args_ex(zend_fcall_info *fci, zend_function *func, zval *args) /* {{{ */
 {
 	zval *arg, *params;
@@ -4234,29 +4217,6 @@ ZEND_API void zend_fcall_info_argn(zend_fcall_info *fci, uint32_t argc, ...) /*
 }
 /* }}} */
 
-ZEND_API zend_result zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval *retval_ptr, zval *args) /* {{{ */
-{
-	zval retval, *org_params = NULL;
-	uint32_t org_count = 0;
-	zend_result result;
-
-	fci->retval = retval_ptr ? retval_ptr : &retval;
-	if (args) {
-		zend_fcall_info_args_save(fci, &org_count, &org_params);
-		zend_fcall_info_args(fci, args);
-	}
-	result = zend_call_function(fci, fcc);
-
-	if (!retval_ptr && Z_TYPE(retval) != IS_UNDEF) {
-		zval_ptr_dtor(&retval);
-	}
-	if (args) {
-		zend_fcall_info_args_restore(fci, org_count, org_params);
-	}
-	return result;
-}
-/* }}} */
-
 ZEND_API void zend_get_callable_zval_from_fcc(const zend_fcall_info_cache *fcc, zval *callable)
 {
 	if (fcc->closure) {

Zend/zend_API.h

@@ -701,15 +701,6 @@ ZEND_API zend_result zend_fcall_info_init(zval *callable, uint32_t check_flags,
  */
 ZEND_API void zend_fcall_info_args_clear(zend_fcall_info *fci, bool free_mem);
 
-/** Save current arguments from zend_fcall_info *fci
- * params array will be set to NULL
- */
-ZEND_API void zend_fcall_info_args_save(zend_fcall_info *fci, uint32_t *param_count, zval **params);
-
-/** Free arguments connected with zend_fcall_info *fci and set back saved ones.
- */
-ZEND_API void zend_fcall_info_args_restore(zend_fcall_info *fci, uint32_t param_count, zval *params);
-
 /** Set or clear the arguments in the zend_call_info struct taking care of
  * refcount. If args is NULL and arguments are set then those are cleared.
  */
@@ -734,11 +725,6 @@ ZEND_API void zend_fcall_info_argv(zend_fcall_info *fci, uint32_t argc, va_list
  */
 ZEND_API void zend_fcall_info_argn(zend_fcall_info *fci, uint32_t argc, ...);
 
-/** Call a function using information created by zend_fcall_info_init()/args().
- * If args is given then those replace the argument info in fci is temporarily.
- */
-ZEND_API zend_result zend_fcall_info_call(zend_fcall_info *fci, zend_fcall_info_cache *fcc, zval *retval, zval *args);
-
 /* Zend FCC API to store and handle PHP userland functions */
 static zend_always_inline bool zend_fcc_equals(const zend_fcall_info_cache* a, const zend_fcall_info_cache* b)
 {