For unpacks, we should also assume there may be named args

nikic · nikic · commit e1e7ae50646a · 2020-07-27T15:57:08.000+02:00
diff --git a/ext/opcache/jit/zend_jit_x86.dasc b/ext/opcache/jit/zend_jit_x86.dasc
@@ -8558,13 +8558,11 @@ static int zend_jit_do_fcall(dasm_State **Dst, const zend_op *opline, const zend
 #endif
 	}
 
-	if ((opline-1)->opcode == ZEND_SEND_UNPACK|| (opline-1)->opcode == ZEND_SEND_ARRAY) {
-		unknown_num_args = 1;
-	}
-
-	bool has_named_args = opline->extended_value == ZEND_FCALL_HAS_NAMED_ARGS;
-	if (has_named_args) {
+	bool may_have_named_args = 0;
+	if ((opline-1)->opcode == ZEND_SEND_UNPACK || (opline-1)->opcode == ZEND_SEND_ARRAY ||
+			opline->extended_value == ZEND_FCALL_HAS_NAMED_ARGS) {
 		unknown_num_args = 1;
+		may_have_named_args = 1;
 	}
 
 	if (info) {
@@ -8872,7 +8870,7 @@ 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 (!has_named_args &&
+			if (!may_have_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))
