guard against name collisions in call stack root expression; need to explicitly resolve against debugger-defined names

This commit is contained in:
Ryan Fleury
2024-10-10 15:34:31 -07:00
parent 79b2bcf37a
commit b9f931a749
2 changed files with 3 additions and 1 deletions
+2
View File
@@ -348,6 +348,7 @@ di_open(DI_Key *key)
internal void internal void
di_close(DI_Key *key) di_close(DI_Key *key)
{ {
ProfBeginFunction();
Temp scratch = scratch_begin(0, 0); Temp scratch = scratch_begin(0, 0);
if(key->path.size != 0) if(key->path.size != 0)
{ {
@@ -405,6 +406,7 @@ di_close(DI_Key *key)
} }
} }
} }
ProfEnd();
scratch_end(scratch); scratch_end(scratch);
} }
+1 -1
View File
@@ -5724,7 +5724,7 @@ RD_VIEW_RULE_UI_FUNCTION_DEF(call_stack)
rd_watch_view_column_alloc(wv, RD_WatchViewColumnKind_Member, 0.20f, .string = str8_lit("vaddr"), .display_string = str8_lit("Address"), .view_rule = str8_lit("cast:U64")); rd_watch_view_column_alloc(wv, RD_WatchViewColumnKind_Member, 0.20f, .string = str8_lit("vaddr"), .display_string = str8_lit("Address"), .view_rule = str8_lit("cast:U64"));
rd_watch_view_column_alloc(wv, RD_WatchViewColumnKind_Module, 0.25f, .string = str8_lit("module.str"), .display_string = str8_lit("Module"), .dequote_string = 1, .is_non_code = 1); rd_watch_view_column_alloc(wv, RD_WatchViewColumnKind_Module, 0.25f, .string = str8_lit("module.str"), .display_string = str8_lit("Module"), .dequote_string = 1, .is_non_code = 1);
} }
rd_watch_view_build(wv, 0, str8_lit("current_thread.callstack.v"), str8_lit("array:current_thread.callstack.count, hex"), 0, 10, rect); rd_watch_view_build(wv, 0, str8_lit("thread:current_thread.callstack.v"), str8_lit("array:'thread:current_thread.callstack.count', hex"), 0, 10, rect);
ProfEnd(); ProfEnd();
} }