[ASan] Migrate lit tests to external symbolizer from asan_symbolize.py script

llvm-svn: 185148

2 files changed, 7 insertions, 16 deletions

diff --git a/compiler-rt/lib/asan/lit_tests/lit.cfg b/compiler-rt/lib/asan/lit_tests/lit.cfg
index 6722e96ed70..1e6725e3dff 100644
--- a/compiler-rt/lib/asan/lit_tests/lit.cfg
+++ b/compiler-rt/lib/asan/lit_tests/lit.cfg
@@ -69,21 +69,12 @@ config.substitutions.append( ("%clangxx_asan ", (" " + config.clang + " " +
 # Setup path to external LLVM symbolizer to run AddressSanitizer output tests.
 llvm_tools_dir = getattr(config, 'llvm_tools_dir', None)
 if llvm_tools_dir:
-  config.environment['LLVM_SYMBOLIZER_PATH'] = os.path.join(
-      llvm_tools_dir, "llvm-symbolizer")
-
-# Setup path to symbolizer script.
-# FIXME: Instead we should copy this script to the build tree and point
-#        at it there.
-asan_source_dir = get_required_attr(config, "asan_source_dir")
-symbolizer = os.path.join(asan_source_dir,
-                         'scripts', 'asan_symbolize.py')
-if not os.path.exists(symbolizer):
-  lit.fatal("Can't find symbolizer script on path %r" % symbolizer)
+  config.environment['ASAN_SYMBOLIZER_PATH'] = os.path.join(
+       llvm_tools_dir, "llvm-symbolizer")
+
 # Define %symbolize substitution that filters output through
-# symbolizer and c++filt (for demangling).
-config.substitutions.append( ("%symbolize ", (" " + symbolizer +
-                                              " | c++filt " )))
+# c++filt (for demangling, somewhy it doesn't work for symbolizer on Mac).
+config.substitutions.append( ("%symbolize ", " c++filt "))
 
 # Define CHECK-%os to check for OS-dependent output.
 config.substitutions.append( ('CHECK-%os', ("CHECK-" + config.host_os)))
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
index 993261aab7b..e2bd6644090 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_win.cc
@@ -35,8 +35,8 @@ void SymbolizerPrepareForSandboxing() {
   // Do nothing on Windows.
 }
 
-const char *Demangle(const char *MangledName) {
-  return MangledName;
+const char *DemangleCXXABI(const char *name) {
+  return name;
 }
 
 }  // namespace __sanitizer