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

Shortcut which allows eliminating several
zend_jit_op_array_trace_extension* variables.

Author: MaxKellermann

ext/opcache/jit/zend_jit_internal.h

@@ -498,6 +498,14 @@ typedef struct _zend_jit_op_array_trace_extension {
 	zend_op_trace_info trace_info[1];
 } zend_jit_op_array_trace_extension;
 
+static zend_always_inline size_t ZEND_OP_TRACE_INFO_OFFSET(const zend_op_array *op_array)
+{
+	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 jit_extension->offset;
+}
+
 static zend_always_inline zend_op_trace_info *ZEND_OP_TRACE_INFO(const zend_op *opline, size_t offset)
 {
 	return (zend_op_trace_info*)((char*)opline + offset);

ext/opcache/jit/zend_jit_trace.c

@@ -7579,8 +7579,6 @@ int ZEND_FASTCALL zend_jit_trace_hot_root(zend_execute_data *execute_data, const
 	zend_jit_trace_stop stop;
 	int ret = 0;
 	zend_op_array *op_array;
-	zend_jit_op_array_trace_extension *jit_extension;
-	size_t offset;
 	uint32_t trace_num;
 	zend_jit_trace_rec trace_buffer[ZEND_JIT_TRACE_MAX_LENGTH];
 
@@ -7592,8 +7590,7 @@ int ZEND_FASTCALL zend_jit_trace_hot_root(zend_execute_data *execute_data, const
 	trace_num = ZEND_JIT_TRACE_NUM;
 	orig_opline = opline;
 	op_array = &EX(func)->op_array;
-	jit_extension = (zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
-	offset = jit_extension->offset;
+	const size_t offset = ZEND_OP_TRACE_INFO_OFFSET(op_array);
 
 	EX(opline) = opline;
 
@@ -7642,9 +7639,7 @@ int ZEND_FASTCALL zend_jit_trace_hot_root(zend_execute_data *execute_data, const
 		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 size_t offset = ZEND_OP_TRACE_INFO_OFFSET(op_array);
 
 			fprintf(stderr, "---- TRACE %d start (%s) %s%s%s() %s:%d\n",
 				trace_num,