Skip to content

Commit aff73cd

Browse files
committed
Don't fallback to the display name. Assume the info is opacetic.
1 parent 2e3bd9f commit aff73cd

File tree

2 files changed

+3
-7
lines changed

2 files changed

+3
-7
lines changed

lldb/include/lldb/Core/Mangled.h

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -291,8 +291,7 @@ class Mangled {
291291
/// demangled name.
292292
///
293293
/// For a demangled name like "ns::MyClass<int>::templateFunc", this returns
294-
/// just "templateFunc". If the demangled name is not available or the
295-
/// basename range is invalid, this falls back to GetDisplayDemangledName().
294+
/// just "templateFunc".
296295
///
297296
/// \return
298297
/// A ConstString containing the basename, or nullptr if computation

lldb/source/Core/Mangled.cpp

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -560,17 +560,14 @@ void Mangled::Encode(DataEncoder &file, ConstStringTable &strtab) const {
560560
ConstString Mangled::GetBaseName() const {
561561
const auto &demangled_info = GetDemangledInfo();
562562
if (!demangled_info.has_value())
563-
return GetDisplayDemangledName();
563+
return {};
564564

565565
ConstString demangled_name = GetDemangledName();
566566
if (!demangled_name)
567-
return GetDisplayDemangledName();
567+
return {};
568568

569569
const char *name_str = demangled_name.AsCString();
570570
const auto &range = demangled_info->BasenameRange;
571-
if (range.first >= range.second || range.second > strlen(name_str))
572-
return ConstString();
573-
574571
return ConstString(
575572
llvm::StringRef(name_str + range.first, range.second - range.first));
576573
}

0 commit comments

Comments
 (0)