* sanitizer_common/sanitizer_symbolizer_libbacktrace.h

[thirdparty/gcc.git] / libsanitizer / sanitizer_common / sanitizer_symbolizer_posix_libcdep.cc

diff --git a/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc b/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
index 9f34b64621770a825e84e6d544f49b9749234e1a..7aead970382248df8f1ce8c198cf7f0d11c5a8a2 100644 (file)
--- a/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
+++ b/libsanitizer/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc
@@ -513,6 +513,11 @@ class POSIXSymbolizer : public Symbolizer {
     SymbolizerScope sym_scope(this);
     if (internal_symbolizer_ != 0)
       return internal_symbolizer_->Demangle(name);
+    if (libbacktrace_symbolizer_ != 0) {
+      const char *demangled = libbacktrace_symbolizer_->Demangle(name);
+      if (demangled)
+       return demangled;
+    }
     return DemangleCXXABI(name);
   }