[llvm-branch-commits] [lldb] 47ea1e1 - [lldb] Use mangled symbol name to look for __asan::AsanDie()

[Tom Stellard via llvm-branch-commits]

Author: Jonas Devlieghere
Date: 2022-02-08T10:29:18-08:00
New Revision: 47ea1e198cec19da30fd3e63b4452147696fb388

URL: https://github.com/llvm/llvm-project/commit/47ea1e198cec19da30fd3e63b4452147696fb388
DIFF: https://github.com/llvm/llvm-project/commit/47ea1e198cec19da30fd3e63b4452147696fb388.diff

LOG: [lldb] Use mangled symbol name to look for __asan::AsanDie()

After aed965d we no longer demangle full symbol names while indexing the
symbol table which means we have to use the mangled name instead of the
demangled name to find the symbol for __asan::AsanDie().

This fixes the following two tests:

  lldb-api :: functionalities/asan/TestMemoryHistory.py
  lldb-api :: functionalities/asan/TestReportData.py

(cherry picked from commit ef3fade14b32c20e0a35b8fca30e7d2f20e0c983)

Added: 
    

Modified: 
    lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp

Removed: 
    


################################################################################
diff  --git a/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp b/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
index 8d8b5c68e41b3..33b2b5dd51559 100644
--- a/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
+++ b/lldb/source/Plugins/InstrumentationRuntime/ASan/InstrumentationRuntimeASan.cpp
@@ -281,7 +281,7 @@ void InstrumentationRuntimeASan::Activate() {
   if (!process_sp)
     return;
 
-  ConstString symbol_name("__asan::AsanDie()");
+  ConstString symbol_name("_ZN6__asanL7AsanDieEv");
   const Symbol *symbol = GetRuntimeModuleSP()->FindFirstSymbolWithNameAndType(
       symbol_name, eSymbolTypeCode);