Skip to content

Commit 4e83aa3

Browse files
authored
Merge pull request wolfpld#611 from Geod24/tracy_demangle_fix
Fix and test TRACY_DEMANGLE for TracyClient
2 parents f15de19 + c6d9741 commit 4e83aa3

File tree

2 files changed

+5
-0
lines changed

2 files changed

+5
-0
lines changed

‎.github/workflows/gcc.yml‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,3 +42,4 @@ jobs:
4242
make -j`nproc` -C test TRACYFLAGS=-DTRACY_ON_DEMAND
4343
make -j`nproc` -C test clean
4444
make -j`nproc` -C test TRACYFLAGS="-DTRACY_DELAYED_INIT -DTRACY_MANUAL_LIFETIME"
45+
make -C test -B ../public/TracyClient.o DEFINES='-DTRACY_DEMANGLE'

‎public/client/TracyCallstack.cpp‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -686,7 +686,9 @@ void InitCallstackCritical()
686686
void InitCallstack()
687687
{
688688
cb_bts = backtrace_create_state( nullptr, 0, nullptr, nullptr );
689+
#ifndef TRACY_DEMANGLE
689690
___tracy_init_demangle_buffer();
691+
#endif
690692

691693
#ifdef __linux
692694
InitKernelSymbols();
@@ -761,7 +763,9 @@ debuginfod_client* GetDebuginfodClient()
761763

762764
void EndCallstack()
763765
{
766+
#ifndef TRACY_DEMANGLE
764767
___tracy_free_demangle_buffer();
768+
#endif
765769
#ifdef TRACY_DEBUGINFOD
766770
ClearDebugInfoVector( s_di_known );
767771
debuginfod_end( s_debuginfod );

0 commit comments

Comments
 (0)