@@ -6906,23 +6906,20 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
6906
6906
const zend_op_array * rec_op_array ;
6907
6907
6908
6908
rec_op_array = op_array = trace_buffer -> op_array ;
6909
- jit_extension =
6910
- (zend_jit_op_array_trace_extension * )ZEND_FUNC_INFO (op_array );
6909
+ size_t offset = ZEND_OP_TRACE_INFO_OFFSET (op_array );
6911
6910
p = trace_buffer + ZEND_JIT_TRACE_START_REC_SIZE ;
6912
6911
for (;;p ++ ) {
6913
6912
if (p -> op == ZEND_JIT_TRACE_VM ) {
6914
6913
opline = p -> opline ;
6915
6914
} else if (p -> op == ZEND_JIT_TRACE_ENTER ) {
6916
6915
if (p -> op_array == rec_op_array ) {
6917
- zend_jit_trace_setup_ret_counter (opline , jit_extension -> offset );
6916
+ zend_jit_trace_setup_ret_counter (opline , offset );
6918
6917
}
6919
6918
op_array = p -> op_array ;
6920
- jit_extension =
6921
- (zend_jit_op_array_trace_extension * )ZEND_FUNC_INFO (op_array );
6919
+ offset = ZEND_OP_TRACE_INFO_OFFSET (op_array );
6922
6920
} else if (p -> op == ZEND_JIT_TRACE_BACK ) {
6923
6921
op_array = p -> op_array ;
6924
- jit_extension =
6925
- (zend_jit_op_array_trace_extension * )ZEND_FUNC_INFO (op_array );
6922
+ offset = ZEND_OP_TRACE_INFO_OFFSET (op_array );
6926
6923
} else if (p -> op == ZEND_JIT_TRACE_END ) {
6927
6924
break ;
6928
6925
}
@@ -6944,9 +6941,10 @@ static const void *zend_jit_trace(zend_jit_trace_rec *trace_buffer, uint32_t par
6944
6941
do {
6945
6942
if (frame -> call_opline ) {
6946
6943
op_array = & frame -> func -> op_array ;
6944
+ const size_t offset = ZEND_OP_TRACE_INFO_OFFSET (op_array );
6947
6945
jit_extension =
6948
6946
(zend_jit_op_array_trace_extension * )ZEND_FUNC_INFO (op_array );
6949
- zend_jit_trace_setup_ret_counter (frame -> call_opline , jit_extension -> offset );
6947
+ zend_jit_trace_setup_ret_counter (frame -> call_opline , offset );
6950
6948
}
6951
6949
frame = frame -> prev ;
6952
6950
} while (frame );
0 commit comments