Fix handling of specialized functions

Author: nikic

Zend/tests/named_params/internal.phpt

@@ -9,6 +9,9 @@ var_dump(array_slice(length: 2, offset: 2, arg: [1, 2, 3, 4, 5]));
 var_dump(array_slice(arg: ['a' => 0, 'b' => 1], offset: 1, preserve_keys: true));
 var_dump(array_slice(['a' => 0, 'b' => 1], preserve_keys: true, offset: 1));
 
+// Named params work with specialized functions.
+var_dump(strlen(str: 'foo'));
+
 ?>
 --EXPECT--
 array(2) {
@@ -31,3 +34,4 @@ array(1) {
   ["b"]=>
   int(1)
 }
+int(3)

Zend/tests/named_params/internal_variadics.phpt

@@ -15,7 +15,15 @@ try {
     echo $e->getMessage(), "\n";
 }
 
+// TODO: Should this work?
+try {
+    call_user_func('strlen', str: 'foo');
+} catch (ArgumentCountError $e) {
+    echo $e->getMessage(), "\n";
+}
+
 ?>
 --EXPECT--
 array_merge() does not accept unknown named parameters
 array_diff_key() does not accept unknown named parameters
+call_user_func() does not accept unknown named parameters

Zend/zend_API.h

@@ -1726,7 +1726,7 @@ ZEND_API ZEND_COLD void ZEND_FASTCALL zend_argument_value_error(uint32_t arg_num
 #define Z_PARAM_VARIADIC(spec, dest, dest_num) \
 	Z_PARAM_VARIADIC_EX(spec, dest, dest_num, 0)
 
-#define Z_PARAM_VARIADIC_WITH_NAMED(spec, dest, dest_num, dest_named) do { \
+#define Z_PARAM_VARIADIC_WITH_NAMED(dest, dest_num, dest_named) do { \
 		int _num_varargs = _num_args - _i; \
 		if (EXPECTED(_num_varargs > 0)) { \
 			dest = _real_arg + 1; \

Zend/zend_compile.c

@@ -3466,11 +3466,12 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a
 }
 /* }}} */
 
-static inline zend_bool zend_args_contain_unpack(zend_ast_list *args) /* {{{ */
+static inline zend_bool zend_args_contain_unpack_or_named(zend_ast_list *args) /* {{{ */
 {
 	uint32_t i;
 	for (i = 0; i < args->children; ++i) {
-		if (args->child[i]->kind == ZEND_AST_UNPACK) {
+		zend_ast *arg = args->child[i];
+		if (arg->kind == ZEND_AST_UNPACK || arg->kind == ZEND_AST_NAMED_ARG) {
 			return 1;
 		}
 	}
@@ -4020,7 +4021,7 @@ int zend_try_compile_special_func(znode *result, zend_string *lcname, zend_ast_l
 		return FAILURE;
 	}
 
-	if (zend_args_contain_unpack(args)) {
+	if (zend_args_contain_unpack_or_named(args)) {
 		return FAILURE;
 	}
 

Zend/zend_execute_API.c

@@ -788,6 +788,7 @@ int zend_call_function(zend_fcall_info *fci, zend_fcall_info_cache *fci_cache) /
 					return FAILURE;
 				}
 
+				/* TODO */
 				/*if (ARG_SHOULD_BE_SENT_BY_REF(func, arg_num)) {
 				}*/
 				ZVAL_COPY(target, val);