From: W. Felix Handte <w@felixhandte.com>
Date: Fri, 13 Jan 2023 16:56:48 +0000 (-0500)
Subject: Don't Even Declare Poisoning Functions if Poisoning is Disabled
X-Git-Tag: v1.5.4^2~52^2
X-Git-Url: http://git.ipfire.org/gitweb/gitweb.cgi?a=commitdiff_plain;h=refs%2Fpull%2F3424%2Fhead;p=thirdparty%2Fzstd.git

Don't Even Declare Poisoning Functions if Poisoning is Disabled

This guarantees that we won't accidentally forget to check the macro somewhere
where we use these functions.
---

diff --git a/lib/common/compiler.h b/lib/common/compiler.h
index 4ad55e601..d4f2f285d 100644
--- a/lib/common/compiler.h
+++ b/lib/common/compiler.h
@@ -292,7 +292,7 @@
 #endif
 #endif
 
-#if ZSTD_MEMORY_SANITIZER
+#if ZSTD_MEMORY_SANITIZER && !defined(ZSTD_MSAN_DONT_POISON_WORKSPACE)
 /* Not all platforms that support msan provide sanitizers/msan_interface.h.
  * We therefore declare the functions we need ourselves, rather than trying to
  * include the header file... */
@@ -313,7 +313,7 @@ void __msan_poison(const volatile void *a, size_t size);
 intptr_t __msan_test_shadow(const volatile void *x, size_t size);
 #endif
 
-#if ZSTD_ADDRESS_SANITIZER
+#if ZSTD_ADDRESS_SANITIZER && !defined(ZSTD_ASAN_DONT_POISON_WORKSPACE)
 /* Not all platforms that support asan provide sanitizers/asan_interface.h.
  * We therefore declare the functions we need ourselves, rather than trying to
  * include the header file... */