Merge branch 'PHP-8.1'

* PHP-8.1:
  JIT: Fix named arguments handling
  JIT: Fix named arguments handling

Author: dstogov

ext/opcache/jit/zend_jit.c

@@ -2629,6 +2629,7 @@ static bool zend_jit_next_is_send_result(const zend_op *opline)
 	if (opline->result_type == IS_TMP_VAR
 	 && (opline+1)->opcode == ZEND_SEND_VAL
 	 && (opline+1)->op1_type == IS_TMP_VAR
+	 && (opline+1)->op2_type != IS_CONST
 	 && (opline+1)->op1.var == opline->result.var) {
 		return 1;
 	}

ext/opcache/jit/zend_jit_arm64.dasc

@@ -14916,10 +14916,10 @@ static bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zend_ssa
 	uint32_t op1_info, op2_info;
 
 	switch (opline->opcode) {
-		case ZEND_QM_ASSIGN:
-		case ZEND_SEND_VAR:
 		case ZEND_SEND_VAL:
 		case ZEND_SEND_VAL_EX:
+			return (opline->op2_type != IS_CONST);
+		case ZEND_QM_ASSIGN:
 		case ZEND_IS_SMALLER:
 		case ZEND_IS_SMALLER_OR_EQUAL:
 		case ZEND_IS_EQUAL:
@@ -15111,6 +15111,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
 			/* break missing intentionally */
 		case ZEND_SEND_VAL:
 		case ZEND_SEND_VAL_EX:
+			if (opline->op2_type == IS_CONST) {
+				break;
+			}
 			if (ssa_op->op1_use == current_var) {
 				regset = ZEND_REGSET(ZREG_REG0);
 				break;
@@ -15127,6 +15130,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
 			}
 			break;
 		case ZEND_SEND_VAR:
+			if (opline->op2_type == IS_CONST) {
+				break;
+			}
 			if (ssa_op->op1_use == current_var ||
 			    ssa_op->op1_def == current_var) {
 				regset = ZEND_REGSET_EMPTY;

ext/opcache/jit/zend_jit_x86.dasc

@@ -15775,10 +15775,11 @@ static bool zend_jit_opline_supports_reg(const zend_op_array *op_array, zend_ssa
 	uint32_t op1_info, op2_info;
 
 	switch (opline->opcode) {
-		case ZEND_QM_ASSIGN:
 		case ZEND_SEND_VAR:
 		case ZEND_SEND_VAL:
 		case ZEND_SEND_VAL_EX:
+			return (opline->op2_type != IS_CONST);
+		case ZEND_QM_ASSIGN:
 		case ZEND_IS_SMALLER:
 		case ZEND_IS_SMALLER_OR_EQUAL:
 		case ZEND_IS_EQUAL:
@@ -15985,6 +15986,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
 			/* break missing intentionally */
 		case ZEND_SEND_VAL:
 		case ZEND_SEND_VAL_EX:
+			if (opline->op2_type == IS_CONST) {
+				break;
+			}
 			if (ssa_op->op1_use == current_var) {
 				regset = ZEND_REGSET(ZREG_R0);
 				break;
@@ -16001,6 +16005,9 @@ static zend_regset zend_jit_get_scratch_regset(const zend_op *opline, const zend
 			}
 			break;
 		case ZEND_SEND_VAR:
+			if (opline->op2_type == IS_CONST) {
+				break;
+			}
 			if (ssa_op->op1_use == current_var ||
 			    ssa_op->op1_def == current_var) {
 				regset = ZEND_REGSET_EMPTY;

ext/opcache/tests/jit/send_val_002.phpt

@@ -0,0 +1,23 @@
+--TEST--
+JIT SEND_VAL: 002 named arg 
+--INI--
+opcache.enable=1
+opcache.enable_cli=1
+opcache.file_update_protection=0
+opcache.jit_buffer_size=1M
+--FILE--
+<?php
+function o(){
+    var_dump(x:$x?1:0);
+}
+o();
+?>
+--EXPECTF--
+Warning: Undefined variable $x in %ssend_val_002.php on line 3
+
+Fatal error: Uncaught ArgumentCountError: var_dump() expects at least 1 argument, 0 given in %ssend_val_002.php:3
+Stack trace:
+#0 %ssend_val_002.php(3): var_dump(x: 0)
+#1 %ssend_val_002.php(5): o()
+#2 {main}
+  thrown in %ssend_val_002.php on line 3