save

Author: yingcong-wu

source/loader/CMakeLists.txt

@@ -173,6 +173,7 @@ if(UR_ENABLE_SANITIZER)
             PRIVATE
             ${CMAKE_CURRENT_SOURCE_DIR}/layers/sanitizer/linux/symbolizer.cpp
         )
+        target_compile_definitions(ur_loader PRIVATE UR_ENABLE_SYMBOLIZER)
         target_include_directories(ur_loader PRIVATE ${LLVM_INCLUDE_DIRS})
         target_link_libraries(ur_loader PRIVATE LLVMSupport LLVMSymbolize)
         # In in-tree build, if LLVM is built with libc++, we also need to build

source/loader/layers/sanitizer/linux/symbolizer.cpp

@@ -12,23 +12,6 @@
 
 namespace ur_sanitizer_layer {
 
-static llvm::symbolize::LLVMSymbolizer *Symbolizer = nullptr;
-
-llvm::symbolize::LLVMSymbolizer *GetSymbolizer() {
-    static auto *Instance = []() {
-        Symbolizer = new llvm::symbolize::LLVMSymbolizer{};
-        return Symbolizer;
-    }();
-    return Instance;
-}
-
-// Let's destruct the symbolizer at the very end of exit process, at least
-// should be after the destructors of the SanitizerLayer since we may print
-// some symbolized information in the SanitizerLayer destructor.
-__attribute__((destructor(101))) void DestructSymbolizer() {
-    delete Symbolizer;
-}
-
 llvm::symbolize::PrinterConfig GetPrinterConfig() {
     llvm::symbolize::PrinterConfig Config;
     Config.Pretty = false;
@@ -59,15 +42,15 @@ void SymbolizeCode(const char *ModuleName, uint64_t ModuleOffset,
     auto Printer =
         std::make_unique<llvm::symbolize::LLVMPrinter>(OS, EH, Config);
 
-    auto ResOrErr = ur_sanitizer_layer::GetSymbolizer()->symbolizeInlinedCode(
+    auto ResOrErr = ur_sanitizer_layer::getContext()->symbolizer.symbolizeInlinedCode(
         ModuleName,
         {ModuleOffset, llvm::object::SectionedAddress::UndefSection});
 
     if (!ResOrErr) {
         return;
     }
     Printer->print(Request, *ResOrErr);
-    ur_sanitizer_layer::GetSymbolizer()->pruneCache();
+    ur_sanitizer_layer::getContext()->symbolizer.pruneCache();
     if (RetSize) {
         *RetSize = Result.size() + 1;
     }

source/loader/layers/sanitizer/ur_sanitizer_layer.hpp

@@ -16,6 +16,10 @@
 #include "ur/ur.hpp"
 #include "ur_proxy_layer.hpp"
 
+#ifdef UR_ENABLE_SYMBOLIZER
+#include "llvm/DebugInfo/Symbolize/Symbolize.h"
+#endif // UR_ENABLE_SYMBOLIZER
+
 #define SANITIZER_COMP_NAME "sanitizer layer"
 
 namespace ur_sanitizer_layer {
@@ -38,6 +42,10 @@ class __urdlllocal context_t : public proxy_layer_context_t,
     std::unique_ptr<SanitizerInterceptor> interceptor;
     SanitizerType enabledType = SanitizerType::None;
 
+#ifdef UR_ENABLE_SYMBOLIZER
+    llvm::symbolize::LLVMSymbolizer symbolizer;
+#endif // UR_ENABLE_SYMBOLIZER
+
     context_t();
     ~context_t();