[lldb] Fix CXX's SymbolNameFitsToLanguage matching other languages #153685
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
The current implementation of CPlusPlusLanguage::SymbolNameFitsToLanguage will return true if there is any mangling scheme for the symbol, not just C++. rdar://158352104
Member
|
@llvm/pr-subscribers-lldb Author: Augusto Noronha (augusto2112) ChangesThe current implementation of Full diff: https://github.com/llvm/llvm-project/pull/153685.diff 2 Files Affected:
diff --git a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
index 3118ff151d1cf..e329cf231db82 100644
--- a/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
+++ b/lldb/source/Plugins/Language/CPlusPlus/CPlusPlusLanguage.cpp
@@ -105,7 +105,8 @@ 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);
+ return mangled_name && Mangled::GetManglingScheme(mangled_name) ==
+ Mangled::eManglingSchemeItanium;
}
ConstString CPlusPlusLanguage::GetDemangledFunctionNameWithoutArguments(
diff --git a/lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp b/lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp
index 6eeb4f54952b9..af01303cc4689 100644
--- a/lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp
+++ b/lldb/unittests/Language/CPlusPlus/CPlusPlusLanguageTest.cpp
@@ -397,3 +397,16 @@ 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));
+}
|
Michael137
reviewed
Aug 14, 2025
| bool CPlusPlusLanguage::SymbolNameFitsToLanguage(Mangled mangled) const { | ||
| const char *mangled_name = mangled.GetMangledName().GetCString(); | ||
| return mangled_name && Mangled::IsMangledName(mangled_name); | ||
| return mangled_name && Mangled::GetManglingScheme(mangled_name) == |
Contributor
Author
There was a problem hiding this comment.
I guess I could check if it's Itanium of MSVC?
Member
There was a problem hiding this comment.
Yea I suppose that should work. It's all best effort I guess, cause non-C++ languages may choose to mangle with the Itanium ABI. But yea your changes make sense
Michael137
reviewed
Aug 15, 2025
| CPlusPlusNameParser((const char *)nullptr); | ||
| } | ||
|
|
||
| TEST(CPlusPlusLanguage, DoesNotMatchCxx) { |
Member
There was a problem hiding this comment.
Since you're adding this here, can you add a case where we do match C++? Using Itanium and MS ABI examples?
Michael137
approved these changes
Aug 15, 2025
bulbazord
approved these changes
Aug 15, 2025
Member
bulbazord
left a comment
bulbazord
left a comment
There was a problem hiding this comment.
+1 to Michael's comments. :)
Michael137
reviewed
Aug 15, 2025
|
|
||
| EXPECT_TRUE(CPlusPlusLang != nullptr); | ||
|
|
||
| Mangled itaniumSymbol("_ZFoo"); |
Member
There was a problem hiding this comment.
Not that it matters much, but should we make these actually demangle-able symbols?
Some minimal ones are:
_Z3Foo
___Z3Bar_block_invoke
?x@@3AH
Contributor
Author
There was a problem hiding this comment.
Ah only saw your comment after merging. I'll make them real symbols.
Collaborator
|
LLVM Buildbot has detected a new failure on builder Full details are available at: https://lab.llvm.org/buildbot/#/builders/59/builds/22691 Here is the relevant piece of the build log for the reference |
augusto2112
added a commit
to augusto2112/llvm-project
that referenced
this pull request
Aug 15, 2025
…lvm#153685) The current implementation of CPlusPlusLanguage::SymbolNameFitsToLanguage will return true if the symbol is mangled for any language that lldb knows about. (cherry picked from commit c6ea7d7)
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
The current implementation of
CPlusPlusLanguage::SymbolNameFitsToLanguage will return true if the symbol is mangled for any language that lldb knows about.