Skip to content

Commit 40fa628

Browse files
committed
Fixed incorrect "TSSA start" headers
1 parent 5a05fef commit 40fa628

File tree

1 file changed

+18
-7
lines changed

1 file changed

+18
-7
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1641,13 +1641,24 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
16411641
}
16421642

16431643
if (UNEXPECTED(ZCG(accel_directives).jit_debug & ZEND_JIT_DEBUG_TRACE_TSSA)) {
1644-
fprintf(stderr, "---- TRACE %d TSSA start (%s) %s() %s:%d\n",
1645-
ZEND_JIT_TRACE_NUM,
1646-
zend_jit_trace_star_desc(trace_buffer->start),
1647-
trace_buffer->op_array->function_name ?
1648-
ZSTR_VAL(trace_buffer->op_array->function_name) : "$main",
1649-
ZSTR_VAL(trace_buffer->op_array->filename),
1650-
((zend_jit_trace_start_rec*)trace_buffer)->opline->lineno);
1644+
if (parent_trace) {
1645+
fprintf(stderr, "---- TRACE %d TSSA start (side trace %d/%d) %s() %s:%d\n",
1646+
ZEND_JIT_TRACE_NUM,
1647+
parent_trace,
1648+
exit_num,
1649+
trace_buffer->op_array->function_name ?
1650+
ZSTR_VAL(trace_buffer->op_array->function_name) : "$main",
1651+
ZSTR_VAL(trace_buffer->op_array->filename),
1652+
((zend_jit_trace_start_rec*)trace_buffer)->opline->lineno);
1653+
} else {
1654+
fprintf(stderr, "---- TRACE %d TSSA start (%s) %s() %s:%d\n",
1655+
ZEND_JIT_TRACE_NUM,
1656+
zend_jit_trace_star_desc(trace_buffer->start),
1657+
trace_buffer->op_array->function_name ?
1658+
ZSTR_VAL(trace_buffer->op_array->function_name) : "$main",
1659+
ZSTR_VAL(trace_buffer->op_array->filename),
1660+
((zend_jit_trace_start_rec*)trace_buffer)->opline->lineno);
1661+
}
16511662
zend_jit_dump_trace(trace_buffer, tssa);
16521663
if (trace_buffer->stop == ZEND_JIT_TRACE_STOP_LINK) {
16531664
uint32_t link_to = zend_jit_find_trace(EG(current_execute_data)->opline->handler);;

0 commit comments

Comments
 (0)