This is an automated email from the ASF dual-hosted git repository.
yiguolei pushed a commit to branch branch-4.1
in repository https://gitbox.apache.org/repos/asf/doris.git
The following commit(s) were added to refs/heads/branch-4.1 by this push:
new 8d721c3bfb8 branch-4.1: [fix](be) Fix duplicate symbol
__lsan_ignore_object when build be ut in LSAN #64164 (#66274)
8d721c3bfb8 is described below
commit 8d721c3bfb8308b4042b0518549a2c38121578c1
Author: github-actions[bot]
<41898282+github-actions[bot]@users.noreply.github.com>
AuthorDate: Fri Jul 31 08:03:39 2026 +0800
branch-4.1: [fix](be) Fix duplicate symbol __lsan_ignore_object when build
be ut in LSAN #64164 (#66274)
Cherry-picked from #64164
Co-authored-by: heguanhui <[email protected]>
Co-authored-by: root <root@DESKTOP-3AF37B>
---
be/src/common/phdr_cache.cpp | 10 ++--------
1 file changed, 2 insertions(+), 8 deletions(-)
diff --git a/be/src/common/phdr_cache.cpp b/be/src/common/phdr_cache.cpp
index 65c6cecf40f..afc2cfb5ab7 100644
--- a/be/src/common/phdr_cache.cpp
+++ b/be/src/common/phdr_cache.cpp
@@ -251,13 +251,7 @@ extern "C"
return iteratePHDRCache(callback, data, ip);
}
-extern "C" {
-#ifdef ADDRESS_SANITIZER
-void __lsan_ignore_object(const void*);
-#else
-void __lsan_ignore_object(const void*) {} // NOLINT
-#endif
-}
+#include "util/debug/leak_annotations.h"
void updatePHDRCache() {
// Fill out ELF header cache for access without locking.
@@ -279,7 +273,7 @@ void updatePHDRCache() {
phdr_cache.store(new_phdr_cache, std::memory_order_release);
/// Memory is intentionally leaked.
- __lsan_ignore_object(new_phdr_cache);
+ ANNOTATE_LEAKING_OBJECT_PTR(new_phdr_cache);
}
bool hasPHDRCache() {
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
