Skip to content

Cp fix symbol name cxx #11183

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 2 commits into from
Aug 15, 2025
Merged

Cp fix symbol name cxx #11183

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0d7d989
[lldb] Fix CXX's SymbolNameFitsToLanguage matching other languages (#…
augusto2112 Aug 15, 2025
c2fd848
[NFC][lldb] Make C++ symbols in CPlusPlusLanguageTest.cpp valid
augusto2112 Aug 15, 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
4 changes: 3 additions & 1 deletion lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,9 @@ CPlusPlusLanguage::GetFunctionNameInfo(ConstString name) const {

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

ConstString CPlusPlusLanguage::GetDemangledFunctionNameWithoutArguments(
Expand Down
30 changes: 30 additions & 0 deletions lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -397,3 +397,33 @@ TEST(CPlusPlusLanguage, CPlusPlusNameParser) {
// Don't crash.
CPlusPlusNameParser((const char *)nullptr);
}

TEST(CPlusPlusLanguage, DoesNotMatchCxx) {
// Test that a symbol name that is NOT C++ does not match C++.

SubsystemRAII<CPlusPlusLanguage> lang;
Language *CPlusPlusLang =
Language::FindPlugin(lldb::eLanguageTypeC_plus_plus);

EXPECT_TRUE(CPlusPlusLang != nullptr);

Mangled swiftSymbol("$sS");
EXPECT_FALSE(CPlusPlusLang->SymbolNameFitsToLanguage(swiftSymbol));
}

TEST(CPlusPlusLanguage, MatchesCxx) {
// Test that a symbol name that is C++ does match C++ (both Itanium and MSVC).

SubsystemRAII<CPlusPlusLanguage> lang;
Language *CPlusPlusLang =
Language::FindPlugin(lldb::eLanguageTypeC_plus_plus);

EXPECT_TRUE(CPlusPlusLang != nullptr);

Mangled itaniumSymbol("_Z3Foo");
EXPECT_TRUE(CPlusPlusLang->SymbolNameFitsToLanguage(itaniumSymbol));
Mangled itaniumExtensionSymbol("___Z3Bar_block_invoke");
EXPECT_TRUE(CPlusPlusLang->SymbolNameFitsToLanguage(itaniumExtensionSymbol));
Mangled msvcSymbol("??x@@3AH");
EXPECT_TRUE(CPlusPlusLang->SymbolNameFitsToLanguage(msvcSymbol));
}