Add flag to distinguish named fcalls

Author: nikic

Zend/zend_compile.c

@@ -3481,6 +3481,32 @@ uint32_t zend_compile_args(zend_ast *ast, zend_function *fbc) /* {{{ */
 }
 /* }}} */
 
+static inline zend_bool zend_args_contain_unpack_or_named(zend_ast_list *args) /* {{{ */
+{
+	uint32_t i;
+	for (i = 0; i < args->children; ++i) {
+		zend_ast *arg = args->child[i];
+		if (arg->kind == ZEND_AST_UNPACK || arg->kind == ZEND_AST_NAMED_ARG) {
+			return 1;
+		}
+	}
+	return 0;
+}
+/* }}} */
+
+static inline zend_bool zend_args_contain_named(zend_ast_list *args) /* {{{ */
+{
+	uint32_t i;
+	for (i = 0; i < args->children; ++i) {
+		zend_ast *arg = args->child[i];
+		if (arg->kind == ZEND_AST_NAMED_ARG) {
+			return 1;
+		}
+	}
+	return 0;
+}
+/* }}} */
+
 ZEND_API zend_uchar zend_get_call_op(const zend_op *init_op, zend_function *fbc) /* {{{ */
 {
 	if (fbc) {
@@ -3525,6 +3551,9 @@ void zend_compile_call_common(znode *result, zend_ast *args_ast, zend_function *
 	}
 
 	opline = zend_emit_op(result, zend_get_call_op(opline, fbc), NULL, NULL);
+	if (zend_args_contain_named(zend_ast_get_list(args_ast))) {
+		opline->extended_value = ZEND_FCALL_HAS_NAMED_ARGS;
+	}
 	zend_do_extended_fcall_end();
 }
 /* }}} */
@@ -3589,19 +3618,6 @@ void zend_compile_dynamic_call(znode *result, znode *name_node, zend_ast *args_a
 }
 /* }}} */
 
-static inline zend_bool zend_args_contain_unpack_or_named(zend_ast_list *args) /* {{{ */
-{
-	uint32_t i;
-	for (i = 0; i < args->children; ++i) {
-		zend_ast *arg = args->child[i];
-		if (arg->kind == ZEND_AST_UNPACK || arg->kind == ZEND_AST_NAMED_ARG) {
-			return 1;
-		}
-	}
-	return 0;
-}
-/* }}} */
-
 int zend_compile_func_strlen(znode *result, zend_ast_list *args) /* {{{ */
 {
 	znode arg_node;

Zend/zend_compile.h

@@ -954,6 +954,8 @@ ZEND_API zend_string *zend_type_to_string(zend_type type);
 
 #define ZEND_THROW_IS_EXPR 1u
 
+#define ZEND_FCALL_HAS_NAMED_ARGS 1
+
 /* The send mode and is_variadic flag are stored as part of zend_type */
 #define _ZEND_SEND_MODE_SHIFT _ZEND_TYPE_EXTRA_FLAGS_SHIFT
 #define _ZEND_IS_VARIADIC_BIT (1 << (_ZEND_TYPE_EXTRA_FLAGS_SHIFT + 2))

ext/opcache/jit/zend_jit.c

@@ -2522,7 +2522,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 					case ZEND_SEND_VAL:
 					case ZEND_SEND_VAL_EX:
 						if (opline->op2_type == IS_CONST) {
-							/* Named parameters not supported in JIT */
+							/* Named parameters not supported in JIT (yet) */
 							break;
 						}
 						if (opline->opcode == ZEND_SEND_VAL_EX
@@ -2536,7 +2536,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						goto done;
 					case ZEND_SEND_REF:
 						if (opline->op2_type == IS_CONST) {
-							/* Named parameters not supported in JIT */
+							/* Named parameters not supported in JIT (yet) */
 							break;
 						}
 						if (!zend_jit_send_ref(&dasm_state, opline, op_array,
@@ -2550,7 +2550,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 					case ZEND_SEND_VAR_NO_REF_EX:
 					case ZEND_SEND_FUNC_ARG:
 						if (opline->op2_type == IS_CONST) {
-							/* Named parameters not supported in JIT */
+							/* Named parameters not supported in JIT (yet) */
 							break;
 						}
 						if ((opline->opcode == ZEND_SEND_VAR_EX
@@ -2573,7 +2573,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						goto done;
 					case ZEND_CHECK_FUNC_ARG:
 						if (opline->op2_type == IS_CONST) {
-							/* Named parameters not supported in JIT */
+							/* Named parameters not supported in JIT (yet) */
 							break;
 						}
 						if (opline->op2.num > MAX_ARG_FLAG_NUM) {

ext/opcache/jit/zend_jit_x86.dasc

@@ -8562,8 +8562,10 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 		unknown_num_args = 1;
 	}
 
-	/* TODO: Only do this for named args */
-	unknown_num_args = 1;
+	bool has_named_args = opline->extended_value == ZEND_FCALL_HAS_NAMED_ARGS;
+	if (has_named_args) {
+		unknown_num_args = 1;
+	}
 
 	if (info) {
 		call_info = info->callee_info;
@@ -8870,7 +8872,8 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 			|	mov ecx, dword [FP + offsetof(zend_execute_data, This.u2.num_args)] // reload
 			|	jmp >1
 			|.code
-			if (!func || (func->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) == 0) {
+			if (!has_named_args &&
+					(!func || (func->op_array.fn_flags & ZEND_ACC_HAS_TYPE_HINTS) == 0)) {
 				if (!func) {
 					|	// if (EXPECTED((op_array->fn_flags & ZEND_ACC_HAS_TYPE_HINTS) == 0))
 					|	test dword [r0 + offsetof(zend_op_array, fn_flags)], ZEND_ACC_HAS_TYPE_HINTS