JIT: Don't reuse IP register for EX(call)

Author: arnaud-lb

ext/opcache/jit/zend_jit.c

@@ -102,7 +102,9 @@ static ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_runtime_jit(ZEND_OPCODE_HANDLE
 
 static int zend_jit_trace_op_len(const zend_op *opline);
 static int zend_jit_trace_may_exit(const zend_op_array *op_array, const zend_op *opline);
-static uint32_t zend_jit_trace_get_exit_point(const zend_op *to_opline, uint32_t flags);
+
+typedef struct _zend_jit_ctx zend_jit_ctx; // TODO
+static uint32_t zend_jit_trace_get_exit_point(zend_jit_ctx *ctx, const zend_op *to_opline, uint32_t flags);
 static const void *zend_jit_trace_get_exit_addr(uint32_t n);
 static void zend_jit_trace_add_code(const void *start, uint32_t size);
 static zend_string *zend_jit_func_name(const zend_op_array *op_array);
@@ -802,6 +804,9 @@ static bool zend_jit_may_be_modified(const zend_function *func, const zend_op_ar
 # pragma clang diagnostic ignored "-Wstring-compare"
 #endif
 
+static bool zend_jit_inc_call_level(uint8_t opcode);
+static bool zend_jit_dec_call_level(uint8_t opcode);
+
 #include "jit/zend_jit_ir.c"
 
 #if defined(__clang__)
@@ -1608,6 +1613,18 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 				call_level++;
 			}
 
+#if ZEND_DEBUG && 0
+			{
+				const void *handler;
+				if (zend_jit_vm_kind == ZEND_VM_KIND_HYBRID) {
+					handler = zend_get_opcode_handler_func(opline);
+				} else {
+					handler = opline->handler;
+				}
+				ir_RSTORE(8, jit_CONST_FUNC(&ctx, (uintptr_t)handler, IR_FASTCALL_FUNC));
+			}
+#endif
+
 			if (JIT_G(opt_level) >= ZEND_JIT_LEVEL_INLINE) {
 				switch (opline->opcode) {
 					case ZEND_PRE_INC:
@@ -1675,10 +1692,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						 && zend_jit_next_is_send_result(opline)) {
 							i++;
 							res_use_info = -1;
-							res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
-							if (!zend_jit_reuse_ip(&ctx)) {
-								goto jit_failure;
-							}
+							res_addr = ZEND_ADDR_REF_ZVAL(ir_ADD_OFFSET(jit_EX_CALL(jit), (opline+1)->result.var));
 						} else {
 							res_use_info = -1;
 
@@ -1729,10 +1743,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						 && zend_jit_next_is_send_result(opline)) {
 							i++;
 							res_use_info = -1;
-							res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
-							if (!zend_jit_reuse_ip(&ctx)) {
-								goto jit_failure;
-							}
+							res_addr = ZEND_ADDR_REF_ZVAL(ir_ADD_OFFSET(jit_EX_CALL(jit), (opline+1)->result.var));
 						} else {
 							res_use_info = -1;
 
@@ -1785,10 +1796,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 						if ((i + 1) <= end
 						 && zend_jit_next_is_send_result(opline)) {
 							i++;
-							res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
-							if (!zend_jit_reuse_ip(&ctx)) {
-								goto jit_failure;
-							}
+							res_addr = ZEND_ADDR_REF_ZVAL(ir_ADD_OFFSET(jit_EX_CALL(jit), (opline+1)->result.var));
 						}
 						if (!zend_jit_concat(&ctx, opline,
 								op1_info, op2_info, res_addr,
@@ -2039,10 +2047,7 @@ static int zend_jit(const zend_op_array *op_array, zend_ssa *ssa, const zend_op
 							 && zend_jit_next_is_send_result(opline)
 							 && (!(op1_info & MAY_HAVE_DTOR) || !(op1_info & MAY_BE_RC1))) {
 								i++;
-								res_addr = ZEND_ADDR_MEM_ZVAL(ZREG_RX, (opline+1)->result.var);
-								if (!zend_jit_reuse_ip(&ctx)) {
-									goto jit_failure;
-								}
+								res_addr = ZEND_ADDR_REF_ZVAL(ir_ADD_OFFSET(jit_EX_CALL(jit), (opline+1)->result.var));
 							}
 						}
 						if (!zend_jit_assign(&ctx, opline,

ext/opcache/jit/zend_jit_internal.h

@@ -240,9 +240,9 @@ ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_loop_counter_helper(ZEND_OPCODE_H
 
 ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_copy_extra_args_helper(ZEND_OPCODE_HANDLER_ARGS);
 ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_copy_extra_args_helper_no_skip_recv(ZEND_OPCODE_HANDLER_ARGS);
-bool ZEND_FASTCALL zend_jit_deprecated_helper(OPLINE_D);
-bool ZEND_FASTCALL zend_jit_nodiscard_helper(OPLINE_D);
-bool ZEND_FASTCALL zend_jit_deprecated_nodiscard_helper(OPLINE_D);
+bool ZEND_FASTCALL zend_jit_deprecated_helper(zend_execute_data *call);
+bool ZEND_FASTCALL zend_jit_nodiscard_helper(zend_execute_data *call);
+bool ZEND_FASTCALL zend_jit_deprecated_nodiscard_helper(zend_execute_data *call);
 void ZEND_FASTCALL zend_jit_undefined_long_key(EXECUTE_DATA_D);
 void ZEND_FASTCALL zend_jit_undefined_long_key_ex(zend_long key EXECUTE_DATA_DC);
 void ZEND_FASTCALL zend_jit_undefined_string_key(EXECUTE_DATA_D);
@@ -446,6 +446,8 @@ typedef struct _zend_jit_trace_exit_info {
 	int32_t              poly_this_ref;
 	int8_t               poly_func_reg;
 	int8_t               poly_this_reg;
+	int32_t              call_ref;
+	int8_t               call_reg;
 } zend_jit_trace_exit_info;
 
 typedef struct _zend_jit_trace_stack {