diff options
| -rw-r--r-- | compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc index 2272f61a953..de1a979bcfe 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_symbolizer_posix_libcdep.cc @@ -63,20 +63,6 @@ const char *DemangleCXXABI(const char *name) { return name; } -// As of now, there are no headers for the Swift runtime. Once they are -// present, we will weakly link since we do not require Swift runtime to be -// linked. -typedef char *(*swift_demangle_ft)(const char *mangledName, - size_t mangledNameLength, char *outputBuffer, - size_t *outputBufferSize, uint32_t flags); -static swift_demangle_ft swift_demangle_f; - -// This must not happen lazily, because dlsym uses thread-local storage, which -// is not a good thing to do during symbolication. -static void InitializeSwiftDemangler() { - swift_demangle_f = (swift_demangle_ft)dlsym(RTLD_DEFAULT, "swift_demangle"); -} - // Attempts to demangle a Swift name. The demangler will return nullptr /// if a non-Swift name is passed in. const char *DemangleSwift(const char *name) { @@ -86,6 +72,16 @@ const char *DemangleSwift(const char *name) { return nullptr; } + // As of now, there are no headers for the Swift runtime. Once they are + // present, we will weakly link since we do not require Swift runtime to be + // linked. + typedef char *(*swift_demangle_ft)(const char *mangledName, + size_t mangledNameLength, + char *outputBuffer, + size_t *outputBufferSize, + uint32_t flags); + swift_demangle_ft swift_demangle_f = + (swift_demangle_ft) dlsym(RTLD_DEFAULT, "swift_demangle"); if (swift_demangle_f) return swift_demangle_f(name, internal_strlen(name), 0, 0, 0); @@ -483,8 +479,6 @@ static void ChooseSymbolizerTools(IntrusiveList<SymbolizerTool> *list, } Symbolizer *Symbolizer::PlatformInit() { - InitializeSwiftDemangler(); - IntrusiveList<SymbolizerTool> list; list.clear(); ChooseSymbolizerTools(&list, &symbolizer_allocator_); |
