ext/opcache/jit/zend_jit_internal: add ZEND_OP_TRACE_INFO2()

Allows eliminating several local variables.

Author: MaxKellermann

ext/opcache/jit/zend_jit_arm64.dasc

@@ -3243,11 +3243,8 @@ static int zend_jit_packed_guard(dasm_State **Dst, const zend_op *opline, uint32
 
 static int zend_jit_trace_handler(dasm_State **Dst, const zend_op_array *op_array, const zend_op *opline, int may_throw, zend_jit_trace_rec *trace)
 {
-	zend_jit_op_array_trace_extension *jit_extension =
-		(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
-	size_t offset = jit_extension->offset;
 	const void *handler =
-		(zend_vm_opcode_handler_t)ZEND_OP_TRACE_INFO(opline, offset)->call_handler;
+		(zend_vm_opcode_handler_t)ZEND_OP_TRACE_INFO2(op_array, opline)->call_handler;
 
 	if (!zend_jit_set_valid_ip(Dst, opline)) {
 		return 0;

ext/opcache/jit/zend_jit_internal.h

@@ -511,6 +511,22 @@ static zend_always_inline zend_op_trace_info *ZEND_OP_TRACE_INFO(const zend_op *
 	return (zend_op_trace_info*)((char*)opline + offset);
 }
 
+/**
+ * Access the #zend_op_trace_info of an #zend_op by looking up the
+ * offset from the specified #zend_op_array.
+ */
+static zend_always_inline zend_op_trace_info *ZEND_OP_TRACE_INFO2(const zend_op_array *op_array, const zend_op *opline)
+{
+	/* the opline must be from the specified function */
+	ZEND_ASSERT(opline >= op_array->opcodes);
+	ZEND_ASSERT(opline < op_array->opcodes + op_array->last);
+
+	const zend_jit_op_array_trace_extension *jit_extension =
+		(const zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
+	ZEND_ASSERT(jit_extension != NULL);
+	return ZEND_OP_TRACE_INFO(opline, jit_extension->offset);
+}
+
 /* Recorder */
 typedef enum _zend_jit_trace_op {
 	ZEND_JIT_TRACE_VM,

ext/opcache/jit/zend_jit_trace.c

@@ -7969,13 +7969,11 @@ static int zend_jit_trace_hot_side(zend_execute_data *execute_data, uint32_t par
 		if (JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_START) {
 			const zend_op_array *op_array = trace_buffer[0].op_array;
 			const zend_op *opline = trace_buffer[1].opline;
-			zend_jit_op_array_trace_extension *jit_extension =
-				(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
-			size_t offset = jit_extension->offset;
+			const zend_op_trace_info *trace_info = ZEND_OP_TRACE_INFO2(op_array, opline);
 
 			fprintf(stderr, "---- TRACE %d start (%s) %s%s%s() %s:%d\n",
 				trace_num,
-				zend_jit_trace_star_desc(ZEND_OP_TRACE_INFO(opline, offset)->trace_flags),
+				zend_jit_trace_star_desc(trace_info->trace_flags),
 				op_array->scope ? ZSTR_VAL(op_array->scope->name) : "",
 				op_array->scope ? "::" : "",
 				op_array->function_name ?
@@ -8197,7 +8195,6 @@ static int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registe
 	}
 
 	if (t->exit_info[exit_num].flags & ZEND_JIT_EXIT_INVALIDATE) {
-		zend_jit_op_array_trace_extension *jit_extension;
 		uint32_t num = trace_num;
 
 		while (t->root != num) {
@@ -8207,8 +8204,7 @@ static int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registe
 
 		zend_shared_alloc_lock();
 
-		jit_extension = (zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(t->op_array);
-		zend_op_trace_info *const trace_info = ZEND_OP_TRACE_INFO(t->opline, jit_extension->offset);
+		zend_op_trace_info *const trace_info = ZEND_OP_TRACE_INFO2(t->op_array, t->opline);
 
 		/* Checks under lock, just in case something has changed while we were waiting for the lock */
 		if (!(trace_info->trace_flags & (ZEND_JIT_TRACE_JITED|ZEND_JIT_TRACE_BLACKLISTED))) {

ext/opcache/jit/zend_jit_vm_helpers.c

@@ -306,13 +306,11 @@ zend_constant* ZEND_FASTCALL zend_jit_check_constant(const zval *key)
 
 static zend_always_inline ZEND_OPCODE_HANDLER_RET ZEND_FASTCALL zend_jit_trace_counter_helper(uint32_t cost ZEND_OPCODE_HANDLER_ARGS_DC)
 {
-	zend_jit_op_array_trace_extension *jit_extension =
-		(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(&EX(func)->op_array);
 #ifndef HAVE_GCC_GLOBAL_REGS
 	const zend_op *opline = EX(opline);
 #endif
 
-	zend_op_trace_info *const trace_info = ZEND_OP_TRACE_INFO(opline, jit_extension->offset);
+	zend_op_trace_info *const trace_info = ZEND_OP_TRACE_INFO2(&EX(func)->op_array, opline);
 
 	*(trace_info->counter) -= cost;
 

ext/opcache/jit/zend_jit_x86.dasc

@@ -3594,11 +3594,8 @@ static int zend_jit_packed_guard(dasm_State **Dst, const zend_op *opline, uint32
 
 static int zend_jit_trace_handler(dasm_State **Dst, const zend_op_array *op_array, const zend_op *opline, int may_throw, zend_jit_trace_rec *trace)
 {
-	zend_jit_op_array_trace_extension *jit_extension =
-		(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
-	size_t offset = jit_extension->offset;
 	const void *handler =
-		(zend_vm_opcode_handler_t)ZEND_OP_TRACE_INFO(opline, offset)->call_handler;
+		(zend_vm_opcode_handler_t)ZEND_OP_TRACE_INFO2(op_array, opline)->call_handler;
 
 	if (!zend_jit_set_valid_ip(Dst, opline)) {
 		return 0;