Skip to content

[lldb] Cherry-pick CPlusPlusLanguage::SymbolNameFitsToLanguage cleanups #11537

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Oct 1, 2025
+7 −13
Merged

[lldb] Cherry-pick CPlusPlusLanguage::SymbolNameFitsToLanguage cleanups #11537

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bb6916c
🍒 [lldb][Mangled][NFC] Remove redundant const-qualifier on llvm::Stri…
Michael137 Oct 1, 2025
b8be76c
🍒 [lldb][CPlusPlusLanguage] Avoid redundant const char* -> StringRef …
Michael137 Oct 1, 2025
a98fd28
🍒 [lldb][NFCI] Remove the non-const reference Mangled::GetMangledName…
Michael137 Oct 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 2 additions & 8 deletions lldb/include/lldb/Core/Mangled.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -153,13 +153,7 @@ class Mangled {
/// Mangled name get accessor.
///
/// \return
/// A reference to the mangled name string object.
ConstString &GetMangledName() { return m_mangled; }

/// Mangled name get accessor.
///
/// \return
/// A const reference to the mangled name string object.
/// The mangled name string object.
ConstString GetMangledName() const { return m_mangled; }

/// Best name get accessor.
Expand Down Expand Up @@ -257,7 +251,7 @@ class Mangled {
/// \return
/// eManglingSchemeNone if no known mangling scheme could be identified
/// for s, otherwise the enumerator for the mangling scheme detected.
static Mangled::ManglingScheme GetManglingScheme(llvm::StringRef const name);
static Mangled::ManglingScheme GetManglingScheme(llvm::StringRef name);

static bool IsMangledName(llvm::StringRef name);

Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Core/Mangled.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ bool Mangled::IsMangledName(llvm::StringRef name) {
return Mangled::GetManglingScheme(name) != Mangled::eManglingSchemeNone;
}

Mangled::ManglingScheme Mangled::GetManglingScheme(llvm::StringRef const name) {
Mangled::ManglingScheme Mangled::GetManglingScheme(llvm::StringRef name) {
if (name.empty())
return Mangled::eManglingSchemeNone;

Expand Down
8 changes: 4 additions & 4 deletions lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,10 +103,10 @@ CPlusPlusLanguage::GetFunctionNameInfo(ConstString name) const {
}

bool CPlusPlusLanguage::SymbolNameFitsToLanguage(Mangled mangled) const {
const char *mangled_name = mangled.GetMangledName().GetCString();
auto mangling_scheme = Mangled::GetManglingScheme(mangled_name);
return mangled_name && (mangling_scheme == Mangled::eManglingSchemeItanium ||
mangling_scheme == Mangled::eManglingSchemeMSVC);
auto mangling_scheme =
Mangled::GetManglingScheme(mangled.GetMangledName().GetStringRef());
return mangling_scheme == Mangled::eManglingSchemeItanium ||
mangling_scheme == Mangled::eManglingSchemeMSVC;
}

ConstString CPlusPlusLanguage::GetDemangledFunctionNameWithoutArguments(
Expand Down