[llvm] 9b10856 - [Demangle] Support Rust v0 mangling scheme in llvm::demangle

[Tomasz Miąsko via llvm-commits]

Author: Tomasz Miąsko
Date: 2021-06-17T10:37:26+02:00
New Revision: 9b1085604ecf3d2d1a416ee658bca981af133128

URL: https://github.com/llvm/llvm-project/commit/9b1085604ecf3d2d1a416ee658bca981af133128
DIFF: https://github.com/llvm/llvm-project/commit/9b1085604ecf3d2d1a416ee658bca981af133128.diff

LOG: [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

Added: 
    

Modified: 
    llvm/lib/Demangle/Demangle.cpp
    llvm/unittests/Demangle/DemangleTest.cpp

Removed: 
    


################################################################################
diff  --git a/llvm/lib/Demangle/Demangle.cpp b/llvm/lib/Demangle/Demangle.cpp
index 000f75b6a977..1851fb77b09e 100644
--- a/llvm/lib/Demangle/Demangle.cpp
+++ b/llvm/lib/Demangle/Demangle.cpp
@@ -19,10 +19,17 @@ static bool isItaniumEncoding(const std::string &MangledName) {
   return Pos > 0 && Pos <= 4 && MangledName[Pos] == 'Z';
 }
 
+static bool isRustEncoding(const std::string &MangledName) {
+  return MangledName.size() >= 2 && MangledName[0] == '_' &&
+         MangledName[1] == 'R';
+}
+
 std::string llvm::demangle(const std::string &MangledName) {
   char *Demangled;
   if (isItaniumEncoding(MangledName))
     Demangled = itaniumDemangle(MangledName.c_str(), nullptr, nullptr, nullptr);
+  else if (isRustEncoding(MangledName))
+    Demangled = rustDemangle(MangledName.c_str(), nullptr, nullptr, nullptr);
   else
     Demangled = microsoftDemangle(MangledName.c_str(), nullptr, nullptr,
                                   nullptr, nullptr);

diff  --git a/llvm/unittests/Demangle/DemangleTest.cpp b/llvm/unittests/Demangle/DemangleTest.cpp
index 1216d2c88537..b7b31f9f2d2b 100644
--- a/llvm/unittests/Demangle/DemangleTest.cpp
+++ b/llvm/unittests/Demangle/DemangleTest.cpp
@@ -21,6 +21,7 @@ TEST(Demangle, demangleTest) {
             "invocation function for block in foo(int)");
   EXPECT_EQ(demangle("?foo@@YAXH at Z"), "void __cdecl foo(int)");
   EXPECT_EQ(demangle("foo"), "foo");
+  EXPECT_EQ(demangle("_RNvC3foo3bar"), "foo::bar");
 
   // Regression test for demangling of optional template-args for vendor
   // extended type qualifier (https://bugs.llvm.org/show_bug.cgi?id=48009)