Skip to content

Commit fc34431

Browse files
committed
fixup! inline-name fallback
1 parent 30eb129 commit fc34431

File tree

2 files changed

+9
-4
lines changed

2 files changed

+9
-4
lines changed

lldb/source/Symbol/SymbolContext.cpp

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -893,9 +893,14 @@ char const *SymbolContext::GetPossiblyInlinedFunctionName(
893893
return name;
894894

895895
// If we do have an inlined frame name, return that.
896-
return inline_info->GetMangled()
897-
.GetName(mangling_preference)
898-
.AsCString(nullptr);
896+
if (char const *inline_name = inline_info->GetMangled()
897+
.GetName(mangling_preference)
898+
.AsCString(nullptr))
899+
return inline_name;
900+
901+
// Sometimes an inline frame may not have mangling information,
902+
// but does have a valid name.
903+
return inline_info->GetName().AsCString(nullptr);
899904
}
900905

901906
//

lldb/test/Shell/Recognizer/verbose_trap-in-stl-max-depth.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,5 +12,5 @@ run
1212
frame recognizer info 0
1313
# CHECK: frame 0 is recognized by Verbose Trap StackFrame Recognizer
1414
frame info
15-
# CHECK: frame #0: {{.*}}`std::recursively_aborts(int) {{.*}} at verbose_trap-in-stl-max-depth.cpp
15+
# CHECK: frame #0: {{.*}}`__clang_trap_msg$Error$max depth at verbose_trap-in-stl-max-depth.cpp
1616
q

0 commit comments

Comments
 (0)