Skip to content

Commit c3206c2

Browse files
committed
Dump class names
1 parent 189751c commit c3206c2

File tree

1 file changed

+24
-8
lines changed

1 file changed

+24
-8
lines changed

ext/opcache/jit/zend_jit_trace.c

Lines changed: 24 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2027,18 +2027,22 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
20272027

20282028
if (UNEXPECTED(JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_TSSA)) {
20292029
if (parent_trace) {
2030-
fprintf(stderr, "---- TRACE %d TSSA start (side trace %d/%d) %s() %s:%d\n",
2030+
fprintf(stderr, "---- TRACE %d TSSA start (side trace %d/%d) %s%s%s() %s:%d\n",
20312031
ZEND_JIT_TRACE_NUM,
20322032
parent_trace,
20332033
exit_num,
2034+
trace_buffer->op_array->scope ? ZSTR_VAL(trace_buffer->op_array->scope->name) : "",
2035+
trace_buffer->op_array->scope ? "::" : "",
20342036
trace_buffer->op_array->function_name ?
20352037
ZSTR_VAL(trace_buffer->op_array->function_name) : "$main",
20362038
ZSTR_VAL(trace_buffer->op_array->filename),
20372039
trace_buffer[1].opline->lineno);
20382040
} else {
2039-
fprintf(stderr, "---- TRACE %d TSSA start (%s) %s() %s:%d\n",
2041+
fprintf(stderr, "---- TRACE %d TSSA start (%s) %s%s%s() %s:%d\n",
20402042
ZEND_JIT_TRACE_NUM,
20412043
zend_jit_trace_star_desc(trace_buffer->start),
2044+
trace_buffer->op_array->scope ? ZSTR_VAL(trace_buffer->op_array->scope->name) : "",
2045+
trace_buffer->op_array->scope ? "::" : "",
20422046
trace_buffer->op_array->function_name ?
20432047
ZSTR_VAL(trace_buffer->op_array->function_name) : "$main",
20442048
ZSTR_VAL(trace_buffer->op_array->filename),
@@ -6227,9 +6231,11 @@ int ZEND_FASTCALL zend_jit_trace_hot_root(zend_execute_data *execute_data, const
62276231
}
62286232

62296233
if (JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_START) {
6230-
fprintf(stderr, "---- TRACE %d start (%s) %s() %s:%d\n",
6234+
fprintf(stderr, "---- TRACE %d start (%s) %s%s%s() %s:%d\n",
62316235
trace_num,
62326236
zend_jit_trace_star_desc(ZEND_OP_TRACE_INFO(opline, offset)->trace_flags),
6237+
EX(func)->op_array.scope ? ZSTR_VAL(EX(func)->op_array.scope->name) : "",
6238+
EX(func)->op_array.scope ? "::" : "",
62336239
EX(func)->op_array.function_name ?
62346240
ZSTR_VAL(EX(func)->op_array.function_name) : "$main",
62356241
ZSTR_VAL(EX(func)->op_array.filename),
@@ -6263,9 +6269,11 @@ int ZEND_FASTCALL zend_jit_trace_hot_root(zend_execute_data *execute_data, const
62636269
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
62646270
size_t offset = jit_extension->offset;
62656271

6266-
fprintf(stderr, "---- TRACE %d start (%s) %s() %s:%d\n",
6272+
fprintf(stderr, "---- TRACE %d start (%s) %s%s%s() %s:%d\n",
62676273
trace_num,
62686274
zend_jit_trace_star_desc(ZEND_OP_TRACE_INFO(opline, offset)->trace_flags),
6275+
op_array->scope ? ZSTR_VAL(op_array->scope->name) : "",
6276+
op_array->scope ? "::" : "",
62696277
op_array->function_name ?
62706278
ZSTR_VAL(op_array->function_name) : "$main",
62716279
ZSTR_VAL(op_array->filename),
@@ -6519,8 +6527,10 @@ int ZEND_FASTCALL zend_jit_trace_hot_side(zend_execute_data *execute_data, uint3
65196527
}
65206528

65216529
if (JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_START) {
6522-
fprintf(stderr, "---- TRACE %d start (side trace %d/%d) %s() %s:%d\n",
6530+
fprintf(stderr, "---- TRACE %d start (side trace %d/%d) %s%s%s() %s:%d\n",
65236531
trace_num, parent_num, exit_num,
6532+
EX(func)->op_array.scope ? ZSTR_VAL(EX(func)->op_array.scope->name) : "",
6533+
EX(func)->op_array.scope ? "::" : "",
65246534
EX(func)->op_array.function_name ?
65256535
ZSTR_VAL(EX(func)->op_array.function_name) : "$main",
65266536
ZSTR_VAL(EX(func)->op_array.filename),
@@ -6569,9 +6579,11 @@ int ZEND_FASTCALL zend_jit_trace_hot_side(zend_execute_data *execute_data, uint3
65696579
(zend_jit_op_array_trace_extension*)ZEND_FUNC_INFO(op_array);
65706580
size_t offset = jit_extension->offset;
65716581

6572-
fprintf(stderr, "---- TRACE %d start (%s) %s() %s:%d\n",
6582+
fprintf(stderr, "---- TRACE %d start (%s) %s%s%s() %s:%d\n",
65736583
trace_num,
65746584
zend_jit_trace_star_desc(ZEND_OP_TRACE_INFO(opline, offset)->trace_flags),
6585+
op_array->scope ? ZSTR_VAL(op_array->scope->name) : "",
6586+
op_array->scope ? "::" : "",
65756587
op_array->function_name ?
65766588
ZSTR_VAL(op_array->function_name) : "$main",
65776589
ZSTR_VAL(op_array->filename),
@@ -6706,9 +6718,11 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf
67066718
if (UNEXPECTED(Z_TYPE_P(val) == IS_UNDEF)) {
67076719
/* Undefined array index or property */
67086720
if (JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_EXIT) {
6709-
fprintf(stderr, " TRACE %d exit %d %s() %s:%d\n",
6721+
fprintf(stderr, " TRACE %d exit %d %s%s%s() %s:%d\n",
67106722
trace_num,
67116723
exit_num,
6724+
EX(func)->op_array.scope ? ZSTR_VAL(EX(func)->op_array.scope->name) : "",
6725+
EX(func)->op_array.scope ? "::" : "",
67126726
EX(func)->op_array.function_name ?
67136727
ZSTR_VAL(EX(func)->op_array.function_name) : "$main",
67146728
ZSTR_VAL(EX(func)->op_array.filename),
@@ -6768,9 +6782,11 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf
67686782
EX(opline) < EX(func)->op_array.opcodes + EX(func)->op_array.last);
67696783

67706784
if (JIT_G(debug) & ZEND_JIT_DEBUG_TRACE_EXIT) {
6771-
fprintf(stderr, " TRACE %d exit %d %s() %s:%d\n",
6785+
fprintf(stderr, " TRACE %d exit %d %s%s%s() %s:%d\n",
67726786
trace_num,
67736787
exit_num,
6788+
EX(func)->op_array.scope ? ZSTR_VAL(EX(func)->op_array.scope->name) : "",
6789+
EX(func)->op_array.scope ? "::" : "",
67746790
EX(func)->op_array.function_name ?
67756791
ZSTR_VAL(EX(func)->op_array.function_name) : "$main",
67766792
ZSTR_VAL(EX(func)->op_array.filename),

0 commit comments

Comments
 (0)