Skip to content

[lldb][NFC] use llvm::StringRef in ExtractContextAndIdentifer function #169506

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 1 commit into from
Nov 25, 2025
Merged

[lldb][NFC] use llvm::StringRef in ExtractContextAndIdentifer function #169506

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 5 additions & 5 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 @@ -84,7 +84,7 @@ CPlusPlusLanguage::GetFunctionNameInfo(ConstString name) const {
if (basename.empty()) {
llvm::StringRef context;
func_name_type |=
(ExtractContextAndIdentifier(name.GetCString(), context, basename)
(ExtractContextAndIdentifier(name.GetStringRef(), context, basename)
? (eFunctionNameTypeMethod | eFunctionNameTypeBase)
: eFunctionNameTypeFull);
} else {
Expand Down Expand Up @@ -546,9 +546,8 @@ bool CPlusPlusLanguage::CxxMethodName::ContainsPath(llvm::StringRef path) {

llvm::StringRef identifier;
llvm::StringRef context;
std::string path_str = path.str();
bool success = CPlusPlusLanguage::ExtractContextAndIdentifier(
path_str.c_str(), context, identifier);
const bool success =
CPlusPlusLanguage::ExtractContextAndIdentifier(path, context, identifier);
if (!success)
return m_full.GetStringRef().contains(path);

Expand Down Expand Up @@ -592,7 +591,8 @@ bool CPlusPlusLanguage::DemangledNameContainsPath(llvm::StringRef path,
}

bool CPlusPlusLanguage::ExtractContextAndIdentifier(
const char *name, llvm::StringRef &context, llvm::StringRef &identifier) {
llvm::StringRef name, llvm::StringRef &context,
llvm::StringRef &identifier) {
if (MSVCUndecoratedNameParser::IsMSVCUndecoratedName(name))
return MSVCUndecoratedNameParser::ExtractContextAndIdentifier(name, context,
identifier);
Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@ class CPlusPlusLanguage : public Language {
// C/C++ identifier, then it will return false
// and identifier and context will be unchanged.

static bool ExtractContextAndIdentifier(const char *name,
static bool ExtractContextAndIdentifier(llvm::StringRef name,
llvm::StringRef &context,
llvm::StringRef &identifier);

Expand Down
2 changes: 1 addition & 1 deletion lldb/source/Plugins/SymbolFile/DWARF/SymbolFileDWARF.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2341,7 +2341,7 @@ void SymbolFileDWARF::FindGlobalVariables(
bool name_is_mangled = Mangled::GetManglingScheme(name.GetStringRef()) !=
Mangled::eManglingSchemeNone;

if (!CPlusPlusLanguage::ExtractContextAndIdentifier(name.GetCString(),
if (!CPlusPlusLanguage::ExtractContextAndIdentifier(name.GetStringRef(),
context, basename))
basename = name.GetStringRef();

Expand Down
2 changes: 1 addition & 1 deletion lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,7 @@ TEST(CPlusPlusLanguage, ExtractContextAndIdentifier) {
llvm::StringRef context, basename;
for (const auto &test : test_cases) {
EXPECT_TRUE(CPlusPlusLanguage::ExtractContextAndIdentifier(
test.input.c_str(), context, basename));
test.input, context, basename));
EXPECT_EQ(test.context, context.str());
EXPECT_EQ(test.basename, basename.str());
}
Expand Down
Loading