jit

Author: nikic

ext/opcache/jit/zend_jit.c

@@ -2584,8 +2584,10 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						}
 						goto done;
 					case ZEND_CHECK_NAMED:
-						/* TODO: Trivial to support! */
-						break;
+						if (!zend_jit_check_named(&dasm_state, opline)) {
+							goto jit_failure;
+						}
+						goto done;
 					case ZEND_DO_UCALL:
 						is_terminated = 1;
 						/* break missing intentionally */

ext/opcache/jit/zend_jit_trace.c

@@ -1576,9 +1576,6 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
 						}
 					}
 					break;
-				case ZEND_CHECK_NAMED:
-					/* TODO: Trivial to support! */
-					break;
 				case ZEND_FETCH_OBJ_FUNC_ARG:
 					if (!frame
 					 || !frame->call
@@ -3638,6 +3635,11 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
 							goto jit_failure;
 						}
 						goto done;
+					case ZEND_CHECK_NAMED:
+						if (!zend_jit_check_named(&dasm_state, opline)) {
+							goto jit_failure;
+						}
+						goto done;
 					case ZEND_DO_UCALL:
 					case ZEND_DO_ICALL:
 					case ZEND_DO_FCALL_BY_NAME:

ext/opcache/jit/zend_jit_x86.dasc

@@ -9200,6 +9200,24 @@ static int zend_jit_send_val(dasm_State **Dst, const zend_op *opline, const zend
 	return 1;
 }
 
+static int zend_jit_check_named(dasm_State **Dst, const zend_op *opline)
+{
+	|	mov FCARG1a, EX->call
+	|	test byte [FCARG1a + offsetof(zend_execute_data, This.u1.type_info) + 3], (ZEND_CALL_MAY_HAVE_UNDEF >> 24)
+	|	jnz >1
+	|.cold_code
+	|1:
+	|	SAVE_VALID_OPLINE opline, r0
+	|	EXT_CALL zend_handle_undef_args, r0
+	|	test r0, r0
+	|	jnz ->exception_handler
+	|	jmp >2
+	|.code
+	|2:
+
+	return 1;
+}
+
 static int zend_jit_send_ref(dasm_State **Dst, const zend_op *opline, const zend_op_array *op_array, uint32_t op1_info, int cold)
 {
 	zend_jit_addr op1_addr, arg_addr, ref_addr;