change to san_utils.cpp

Author: yingcong-wu

source/loader/layers/sanitizer/asan_interceptor.cpp

@@ -13,7 +13,6 @@
 
 #include "asan_interceptor.hpp"
 #include "ur_sanitizer_layer.hpp"
-#include <cxxabi.h>
 
 namespace ur_sanitizer_layer {
 
@@ -283,12 +282,7 @@ void SanitizerInterceptor::postLaunchKernel(ur_kernel_handle_t Kernel,
         auto KernelName = getKernelName(Kernel);
 
         // Try to demangle the kernel name
-        char *demangled_name =
-            abi::__cxa_demangle(KernelName.c_str(), nullptr, nullptr, nullptr);
-        if (demangled_name) {
-            KernelName = demangled_name;
-            free(demangled_name);
-        }
+        KernelName = DemangleName(KernelName);
 
         context.logger.always("\n====ERROR: DeviceSanitizer: {} on {}",
                               DeviceSanitizerFormat(AH->ErrorType),

source/loader/layers/sanitizer/common.hpp

@@ -17,6 +17,7 @@
 
 #include <cassert>
 #include <cstdint>
+#include <string>
 
 namespace ur_sanitizer_layer {
 
@@ -107,4 +108,6 @@ bool DestroyShadowMem();
 
 void *GetMemFunctionPointer(const char *);
 
+std::string DemangleName(const std::string &name);
+
 } // namespace ur_sanitizer_layer

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

@@ -15,8 +15,10 @@
 #include "ur_sanitizer_layer.hpp"
 
 #include <asm/param.h>
+#include <cxxabi.h>
 #include <dlfcn.h>
 #include <gnu/lib-names.h>
+#include <string>
 #include <sys/mman.h>
 
 extern "C" __attribute__((weak)) void __asan_init(void);
@@ -84,4 +86,15 @@ void *GetMemFunctionPointer(const char *FuncName) {
     return ptr;
 }
 
+std::string DemangleName(const std::string &name) {
+    std::string result = name;
+    char *demangled =
+        abi::__cxa_demangle(name.c_str(), nullptr, nullptr, nullptr);
+    if (demangled) {
+        result = demangled;
+        free(demangled);
+    }
+    return result;
+}
+
 } // namespace ur_sanitizer_layer