[libc][NFC] Move code to sanitizer.h + more consistent naming

Author: gchatelet

libc/src/__support/FPUtil/x86_64/FEnvImpl.h

@@ -104,7 +104,7 @@ struct X87StateDescriptor {
 LIBC_INLINE uint16_t get_x87_control_word() {
   uint16_t w;
   __asm__ __volatile__("fnstcw %0" : "=m"(w)::);
-  SANITIZER_MEMORY_INITIALIZED(&w, sizeof(w));
+  MSAN_UNPOISON(&w, sizeof(w));
   return w;
 }
 
@@ -115,7 +115,7 @@ LIBC_INLINE void write_x87_control_word(uint16_t w) {
 LIBC_INLINE uint16_t get_x87_status_word() {
   uint16_t w;
   __asm__ __volatile__("fnstsw %0" : "=m"(w)::);
-  SANITIZER_MEMORY_INITIALIZED(&w, sizeof(w));
+  MSAN_UNPOISON(&w, sizeof(w));
   return w;
 }
 
@@ -126,7 +126,7 @@ LIBC_INLINE void clear_x87_exceptions() {
 LIBC_INLINE uint32_t get_mxcsr() {
   uint32_t w;
   __asm__ __volatile__("stmxcsr %0" : "=m"(w)::);
-  SANITIZER_MEMORY_INITIALIZED(&w, sizeof(w));
+  MSAN_UNPOISON(&w, sizeof(w));
   return w;
 }
 
@@ -136,7 +136,7 @@ LIBC_INLINE void write_mxcsr(uint32_t w) {
 
 LIBC_INLINE void get_x87_state_descriptor(X87StateDescriptor &s) {
   __asm__ __volatile__("fnstenv %0" : "=m"(s));
-  SANITIZER_MEMORY_INITIALIZED(&s, sizeof(s));
+  MSAN_UNPOISON(&s, sizeof(s));
 }
 
 LIBC_INLINE void write_x87_state_descriptor(const X87StateDescriptor &s) {

libc/src/__support/macros/sanitizer.h

@@ -49,8 +49,20 @@
 
 #if LIBC_HAVE_MEMORY_SANITIZER
 #include <sanitizer/msan_interface.h>
-#define SANITIZER_MEMORY_INITIALIZED(addr, size) __msan_unpoison(addr, size)
+#define MSAN_UNPOISON(addr, size) __msan_unpoison(addr, size)
 #else
-#define SANITIZER_MEMORY_INITIALIZED(ptr, size)
+#define MSAN_UNPOISON(ptr, size)
 #endif
+
+#if LIBC_HAVE_ADDRESS_SANITIZER
+#include <sanitizer/asan_interface.h>
+#define ASAN_POISON_MEMORY_REGION(addr, size)                                  \
+  __asan_poison_memory_region((addr), (size))
+#define ASAN_UNPOISON_MEMORY_REGION(addr, size)                                \
+  __asan_unpoison_memory_region((addr), (size))
+#else
+#define ASAN_POISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
+#define ASAN_UNPOISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
+#endif
+
 #endif // LLVM_LIBC_SRC_SUPPORT_MACROS_SANITIZER_H

libc/test/src/string/CMakeLists.txt

@@ -367,6 +367,7 @@ function(add_libc_multi_impl_test name)
         ${ARGN}
         DEPENDS
           ${fq_config_name}
+          libc.src.__support.sanitizer
       )
       get_fq_target_name(${fq_config_name}_test fq_target_name)
     else()

libc/test/src/string/memory_utils/memory_check_utils.h

@@ -11,23 +11,13 @@
 
 #include "src/__support/CPP/span.h"
 #include "src/__support/macros/compiler_features.h"
+#include "src/__support/macros/sanitizer.h"
 #include "src/string/memory_utils/utils.h"
 #include <assert.h> // assert
 #include <stddef.h> // size_t
 #include <stdint.h> // uintxx_t
 #include <stdlib.h> // malloc/free
 
-#if LIBC_HAS_FEATURE(address_sanitizer) || defined(__SANITIZE_ADDRESS__)
-#include <sanitizer/asan_interface.h>
-#define ASAN_POISON_MEMORY_REGION(addr, size)                                  \
-  __asan_poison_memory_region((addr), (size))
-#define ASAN_UNPOISON_MEMORY_REGION(addr, size)                                \
-  __asan_unpoison_memory_region((addr), (size))
-#else
-#define ASAN_POISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
-#define ASAN_UNPOISON_MEMORY_REGION(addr, size) ((void)(addr), (void)(size))
-#endif
-
 namespace __llvm_libc {
 
 // Simple structure to allocate a buffer of a particular size.

utils/bazel/llvm-project-overlay/libc/test/src/string/BUILD.bazel

@@ -111,6 +111,7 @@ cc_library(
     hdrs = ["memory_utils/memory_check_utils.h"],
     deps = [
         "//libc:__support_cpp_span",
+        "//libc:__support_sanitizer",
         "//libc:string_memory_utils",
     ],
 )