Skip to content

Commit 9b10856

Browse files
committed
[Demangle] Support Rust v0 mangling scheme in llvm::demangle
The llvm::demangle is currently used by llvm-objdump and llvm-readobj, so this effectively adds support for Rust v0 mangling to those applications. Reviewed By: dblaikie Differential Revision: https://reviews.llvm.org/D104340
1 parent 80a4033 commit 9b10856

File tree

2 files changed

+8
-0
lines changed

2 files changed

+8
-0
lines changed

llvm/lib/Demangle/Demangle.cpp

+7
Original file line numberDiff line numberDiff line change
@@ -19,10 +19,17 @@ static bool isItaniumEncoding(const std::string &MangledName) {
1919
return Pos > 0 && Pos <= 4 && MangledName[Pos] == 'Z';
2020
}
2121

22+
static bool isRustEncoding(const std::string &MangledName) {
23+
return MangledName.size() >= 2 && MangledName[0] == '_' &&
24+
MangledName[1] == 'R';
25+
}
26+
2227
std::string llvm::demangle(const std::string &MangledName) {
2328
char *Demangled;
2429
if (isItaniumEncoding(MangledName))
2530
Demangled = itaniumDemangle(MangledName.c_str(), nullptr, nullptr, nullptr);
31+
else if (isRustEncoding(MangledName))
32+
Demangled = rustDemangle(MangledName.c_str(), nullptr, nullptr, nullptr);
2633
else
2734
Demangled = microsoftDemangle(MangledName.c_str(), nullptr, nullptr,
2835
nullptr, nullptr);

llvm/unittests/Demangle/DemangleTest.cpp

+1
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ TEST(Demangle, demangleTest) {
2121
"invocation function for block in foo(int)");
2222
EXPECT_EQ(demangle("?foo@@YAXH@Z"), "void __cdecl foo(int)");
2323
EXPECT_EQ(demangle("foo"), "foo");
24+
EXPECT_EQ(demangle("_RNvC3foo3bar"), "foo::bar");
2425

2526
// Regression test for demangling of optional template-args for vendor
2627
// extended type qualifier (https://bugs.llvm.org/show_bug.cgi?id=48009)

0 commit comments

Comments
 (0)