Merge branch 'yc-test/1024-devasan-bug-symbolizer-destruct-too-early' into yc/1024-devasan-bug-symbolizer-destruct-too-early

Author: yingcong-wu

source/loader/CMakeLists.txt

@@ -171,7 +171,6 @@ 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

@@ -7,15 +7,10 @@
  * SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
  *
  */
-
-#include "ur_sanitizer_layer.hpp"
-
 #include "llvm/DebugInfo/Symbolize/DIPrinter.h"
 #include "llvm/DebugInfo/Symbolize/Symbolize.h"
 
-namespace ur_sanitizer_layer {
-
-llvm::symbolize::PrinterConfig GetPrinterConfig() {
+static llvm::symbolize::PrinterConfig GetPrinterConfig() {
     llvm::symbolize::PrinterConfig Config;
     Config.Pretty = false;
     Config.PrintAddress = false;
@@ -25,36 +20,32 @@ llvm::symbolize::PrinterConfig GetPrinterConfig() {
     return Config;
 }
 
-} // namespace ur_sanitizer_layer
-
 extern "C" {
 
 void SymbolizeCode(const char *ModuleName, uint64_t ModuleOffset,
                    char *ResultString, size_t ResultSize, size_t *RetSize) {
     std::string Result;
     llvm::raw_string_ostream OS(Result);
     llvm::symbolize::Request Request{ModuleName, ModuleOffset};
-    llvm::symbolize::PrinterConfig Config =
-        ur_sanitizer_layer::GetPrinterConfig();
+    llvm::symbolize::PrinterConfig Config = GetPrinterConfig();
     llvm::symbolize::ErrorHandler EH = [&](const llvm::ErrorInfoBase &ErrorInfo,
                                            llvm::StringRef ErrorBanner) {
         OS << ErrorBanner;
         ErrorInfo.log(OS);
         OS << '\n';
     };
-    auto Printer =
-        std::make_unique<llvm::symbolize::LLVMPrinter>(OS, EH, Config);
+    llvm::symbolize::LLVMSymbolizer Symbolizer;
+    llvm::symbolize::LLVMPrinter Printer(OS, EH, Config);
 
-    auto ResOrErr =
-        ur_sanitizer_layer::getContext()->symbolizer.symbolizeInlinedCode(
-            ModuleName,
-            {ModuleOffset, llvm::object::SectionedAddress::UndefSection});
+    auto ResOrErr = Symbolizer.symbolizeInlinedCode(
+        ModuleName,
+        {ModuleOffset, llvm::object::SectionedAddress::UndefSection});
 
     if (!ResOrErr) {
         return;
     }
-    Printer->print(Request, *ResOrErr);
-    ur_sanitizer_layer::getContext()->symbolizer.pruneCache();
+    Printer.print(Request, *ResOrErr);
+    Symbolizer.pruneCache();
     if (RetSize) {
         *RetSize = Result.size() + 1;
     }

source/loader/layers/sanitizer/ur_sanitizer_layer.hpp

@@ -16,10 +16,6 @@
 #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 {
@@ -42,10 +38,6 @@ 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();