Demangle names using pluggable internal symbolizer if possible

git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@185146 91177308-0d34-0410-b5e6-96231b3b80d8

1 files changed, 26 insertions, 2 deletions

diff --git a/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cc b/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cc
index 2f32257b..2588dd19 100644
--- a/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cc
+++ b/lib/sanitizer_common/sanitizer_symbolizer_libcdep.cc
@@ -190,6 +190,9 @@ bool __sanitizer_symbolize_data(const char *ModuleName, u64 ModuleOffset,
                                 char *Buffer, int MaxLength);
 SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
 void __sanitizer_symbolize_flush();
+SANITIZER_WEAK_ATTRIBUTE SANITIZER_INTERFACE_ATTRIBUTE
+void __sanitizer_symbolize_demangle(const char *Name, char *Buffer,
+                                    int MaxLength);
 }  // extern "C"
 
 class InternalSymbolizer {
@@ -218,10 +221,21 @@ class InternalSymbolizer {
       __sanitizer_symbolize_flush();
   }
 
+  const char *Demangle(const char *name) {
+    if (__sanitizer_symbolize_demangle) {
+      char *res = static_cast<char*>(InternalAlloc(kMaxDemangledNameSize));
+      internal_memset(res, 0, kMaxDemangledNameSize);
+      __sanitizer_symbolize_demangle(name, res, kMaxDemangledNameSize);
+      return res;
+    }
+    return name;
+  }
+
  private:
   InternalSymbolizer() { }
 
   static const int kBufferSize = 16 * 1024;
+  static const int kMaxDemangledNameSize = 1024;
   char buffer_[kBufferSize];
 };
 #else  // SANITIZER_SUPPORTS_WEAK_HOOKS
@@ -232,8 +246,8 @@ class InternalSymbolizer {
   char *SendCommand(bool is_data, const char *module_name, uptr module_offset) {
     return 0;
   }
-  void Flush() {
-  }
+  void Flush() { }
+  const char *Demangle(const char *name) { return name; }
 };
 
 #endif  // SANITIZER_SUPPORTS_WEAK_HOOKS
@@ -345,6 +359,12 @@ class Symbolizer {
       external_symbolizer_->Flush();
   }
 
+  const char *Demangle(const char *name) {
+    if (IsSymbolizerAvailable() && internal_symbolizer_ != 0)
+      return internal_symbolizer_->Demangle(name);
+    return DemangleCXXABI(name);
+  }
+
  private:
   char *SendCommand(bool is_data, const char *module_name, uptr module_offset) {
     // First, try to use internal symbolizer.
@@ -451,4 +471,8 @@ void FlushSymbolizer() {
   symbolizer.Flush();
 }
 
+const char *Demangle(const char *name) {
+  return symbolizer.Demangle(name);
+}
+
 }  // namespace __sanitizer