Demangle Rust symbols

#371

Author: rui314

Makefile

@@ -23,7 +23,7 @@ endif
 STRIP = strip
 
 SRCS = $(wildcard *.cc elf/*.cc macho/*.cc)
-OBJS = $(SRCS:%.cc=out/%.o)
+OBJS = $(SRCS:%.cc=out/%.o) out/rust-demangle.o
 
 OS := $(shell uname -s)
 ARCH := $(shell uname -m)
@@ -39,7 +39,7 @@ CFLAGS = -O2
 CXXFLAGS = -O2
 
 MOLD_CXXFLAGS := -std=c++20 -fno-exceptions -fno-unwind-tables \
-                 -fno-asynchronous-unwind-tables -Ithird-party/xxhash \
+                 -fno-asynchronous-unwind-tables -Ithird-party \
                  -DMOLD_VERSION=\"$(VERSION)\" -DLIBDIR="\"$(LIBDIR)\""
 
 MOLD_LDFLAGS := -pthread -lz -lm -ldl
@@ -132,6 +132,9 @@ mold: $(OBJS) $(MIMALLOC_LIB) $(TBB_LIB)
 mold-wrapper.so: elf/mold-wrapper.c
 	$(CC) $(DEPFLAGS) $(CFLAGS) -fPIC -shared -o $@ $< $(MOLD_WRAPPER_LDFLAGS) $(LDFLAGS)
 
+out/rust-demangle.o: third-party/rust-demangle/rust-demangle.c
+	$(CC) $(CFLAGS) -c -o $@ $<
+
 out/%.o: %.cc out/elf/.keep out/macho/.keep
 	$(CXX) $(MOLD_CXXFLAGS) $(DEPFLAGS) $(CXXFLAGS) -c -o $@ $<
 

demangle.cc

@@ -2,20 +2,25 @@
 
 #include <cstdlib>
 #include <cxxabi.h>
+#include <rust-demangle/rust-demangle.h>
 
 namespace mold {
 
 std::string_view demangle(std::string_view name) {
   if (name.starts_with("_Z")) {
     static thread_local char *buf;
-    static thread_local size_t buflen;
+    if (buf)
+      free(buf);
 
     int status;
-    char *p = abi::__cxa_demangle(std::string(name).c_str(), buf, &buflen, &status);
-    if (status == 0) {
-      buf = p;
-      return p;
-    }
+    buf = abi::__cxa_demangle(std::string(name).c_str(), nullptr, nullptr,
+                              &status);
+    if (status == 0)
+      return buf;
+
+    buf = rust_demangle(std::string(name).c_str(), 0);
+    if (buf)
+      return buf;
   }
 
   return name;

mold.h

@@ -27,7 +27,7 @@
 #include <vector>
 
 #define XXH_INLINE_ALL 1
-#include <xxhash.h>
+#include <xxhash/xxhash.h>
 
 #ifdef NDEBUG
 #  define unreachable() __builtin_unreachable()