@@ -2027,18 +2027,22 @@ static zend_ssa *zend_jit_trace_build_tssa(zend_jit_trace_rec *trace_buffer, uin
2027
2027
2028
2028
if (UNEXPECTED (JIT_G (debug ) & ZEND_JIT_DEBUG_TRACE_TSSA )) {
2029
2029
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" ,
2031
2031
ZEND_JIT_TRACE_NUM ,
2032
2032
parent_trace ,
2033
2033
exit_num ,
2034
+ trace_buffer -> op_array -> scope ? ZSTR_VAL (trace_buffer -> op_array -> scope -> name ) : "" ,
2035
+ trace_buffer -> op_array -> scope ? "::" : "" ,
2034
2036
trace_buffer -> op_array -> function_name ?
2035
2037
ZSTR_VAL (trace_buffer -> op_array -> function_name ) : "$main" ,
2036
2038
ZSTR_VAL (trace_buffer -> op_array -> filename ),
2037
2039
trace_buffer [1 ].opline -> lineno );
2038
2040
} 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" ,
2040
2042
ZEND_JIT_TRACE_NUM ,
2041
2043
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 ? "::" : "" ,
2042
2046
trace_buffer -> op_array -> function_name ?
2043
2047
ZSTR_VAL (trace_buffer -> op_array -> function_name ) : "$main" ,
2044
2048
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
6227
6231
}
6228
6232
6229
6233
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" ,
6231
6235
trace_num ,
6232
6236
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 ? "::" : "" ,
6233
6239
EX (func )-> op_array .function_name ?
6234
6240
ZSTR_VAL (EX (func )-> op_array .function_name ) : "$main" ,
6235
6241
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
6263
6269
(zend_jit_op_array_trace_extension * )ZEND_FUNC_INFO (op_array );
6264
6270
size_t offset = jit_extension -> offset ;
6265
6271
6266
- fprintf (stderr , "---- TRACE %d start (%s) %s() %s:%d\n" ,
6272
+ fprintf (stderr , "---- TRACE %d start (%s) %s%s%s () %s:%d\n" ,
6267
6273
trace_num ,
6268
6274
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 ? "::" : "" ,
6269
6277
op_array -> function_name ?
6270
6278
ZSTR_VAL (op_array -> function_name ) : "$main" ,
6271
6279
ZSTR_VAL (op_array -> filename ),
@@ -6519,8 +6527,10 @@ int ZEND_FASTCALL zend_jit_trace_hot_side(zend_execute_data *execute_data, uint3
6519
6527
}
6520
6528
6521
6529
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" ,
6523
6531
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 ? "::" : "" ,
6524
6534
EX (func )-> op_array .function_name ?
6525
6535
ZSTR_VAL (EX (func )-> op_array .function_name ) : "$main" ,
6526
6536
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
6569
6579
(zend_jit_op_array_trace_extension * )ZEND_FUNC_INFO (op_array );
6570
6580
size_t offset = jit_extension -> offset ;
6571
6581
6572
- fprintf (stderr , "---- TRACE %d start (%s) %s() %s:%d\n" ,
6582
+ fprintf (stderr , "---- TRACE %d start (%s) %s%s%s () %s:%d\n" ,
6573
6583
trace_num ,
6574
6584
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 ? "::" : "" ,
6575
6587
op_array -> function_name ?
6576
6588
ZSTR_VAL (op_array -> function_name ) : "$main" ,
6577
6589
ZSTR_VAL (op_array -> filename ),
@@ -6706,9 +6718,11 @@ int ZEND_FASTCALL zend_jit_trace_exit(uint32_t exit_num, zend_jit_registers_buf
6706
6718
if (UNEXPECTED (Z_TYPE_P (val ) == IS_UNDEF )) {
6707
6719
/* Undefined array index or property */
6708
6720
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" ,
6710
6722
trace_num ,
6711
6723
exit_num ,
6724
+ EX (func )-> op_array .scope ? ZSTR_VAL (EX (func )-> op_array .scope -> name ) : "" ,
6725
+ EX (func )-> op_array .scope ? "::" : "" ,
6712
6726
EX (func )-> op_array .function_name ?
6713
6727
ZSTR_VAL (EX (func )-> op_array .function_name ) : "$main" ,
6714
6728
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
6768
6782
EX (opline ) < EX (func )-> op_array .opcodes + EX (func )-> op_array .last );
6769
6783
6770
6784
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" ,
6772
6786
trace_num ,
6773
6787
exit_num ,
6788
+ EX (func )-> op_array .scope ? ZSTR_VAL (EX (func )-> op_array .scope -> name ) : "" ,
6789
+ EX (func )-> op_array .scope ? "::" : "" ,
6774
6790
EX (func )-> op_array .function_name ?
6775
6791
ZSTR_VAL (EX (func )-> op_array .function_name ) : "$main" ,
6776
6792
ZSTR_VAL (EX (func )-> op_array .filename ),
0 commit comments