[compiler-rt] 15b0cb4 - [windows][ASan] Fix build (#70855)

[via llvm-commits]

Author: nicole mazzuca
Date: 2023-10-31T14:14:58-07:00
New Revision: 15b0cb4c72a0ef471b0c86284863ed88a6778088

URL: https://github.com/llvm/llvm-project/commit/15b0cb4c72a0ef471b0c86284863ed88a6778088
DIFF: https://github.com/llvm/llvm-project/commit/15b0cb4c72a0ef471b0c86284863ed88a6778088.diff

LOG: [windows][ASan] Fix build (#70855)

PR #69625 broke the build - I put __cdecl on the wrong side of the `*`
in function pointer declarations.

Lesson learned - run check-all!

Added: 
    

Modified: 
    compiler-rt/include/sanitizer/allocator_interface.h
    compiler-rt/include/sanitizer/dfsan_interface.h
    compiler-rt/include/sanitizer/msan_interface.h

Removed: 
    


################################################################################
diff  --git a/compiler-rt/include/sanitizer/allocator_interface.h b/compiler-rt/include/sanitizer/allocator_interface.h
index 19af06969e08353..a792e9f0136e688 100644
--- a/compiler-rt/include/sanitizer/allocator_interface.h
+++ b/compiler-rt/include/sanitizer/allocator_interface.h
@@ -83,8 +83,8 @@ void SANITIZER_CDECL __sanitizer_free_hook(const volatile void *ptr);
    other threads.
 */
 int SANITIZER_CDECL __sanitizer_install_malloc_and_free_hooks(
-    void (*SANITIZER_CDECL malloc_hook)(const volatile void *, size_t),
-    void (*SANITIZER_CDECL free_hook)(const volatile void *));
+    void(SANITIZER_CDECL *malloc_hook)(const volatile void *, size_t),
+    void(SANITIZER_CDECL *free_hook)(const volatile void *));
 
 /* Drains allocator quarantines (calling thread's and global ones), returns
    freed memory back to OS and releases other non-essential internal allocator

diff  --git a/compiler-rt/include/sanitizer/dfsan_interface.h b/compiler-rt/include/sanitizer/dfsan_interface.h
index 1084ec1f53cc091..4e52e1b54cd8926 100644
--- a/compiler-rt/include/sanitizer/dfsan_interface.h
+++ b/compiler-rt/include/sanitizer/dfsan_interface.h
@@ -25,16 +25,16 @@ typedef uint8_t dfsan_label;
 typedef uint32_t dfsan_origin;
 
 /// Signature of the callback argument to dfsan_set_write_callback().
-typedef void (*SANITIZER_CDECL dfsan_write_callback_t)(int fd, const void *buf,
-                                                       size_t count);
+typedef void(SANITIZER_CDECL *dfsan_write_callback_t)(int fd, const void *buf,
+                                                      size_t count);
 
 /// Signature of the callback argument to dfsan_set_conditional_callback().
-typedef void (*SANITIZER_CDECL dfsan_conditional_callback_t)(
+typedef void(SANITIZER_CDECL *dfsan_conditional_callback_t)(
     dfsan_label label, dfsan_origin origin);
 
 /// Signature of the callback argument to dfsan_set_reaches_function_callback().
 /// The description is intended to hold the name of the variable.
-typedef void (*SANITIZER_CDECL dfsan_reaches_function_callback_t)(
+typedef void(SANITIZER_CDECL *dfsan_reaches_function_callback_t)(
     dfsan_label label, dfsan_origin origin, const char *file, unsigned int line,
     const char *function);
 

diff  --git a/compiler-rt/include/sanitizer/msan_interface.h b/compiler-rt/include/sanitizer/msan_interface.h
index 459de876894888b..6fedc031254537f 100644
--- a/compiler-rt/include/sanitizer/msan_interface.h
+++ b/compiler-rt/include/sanitizer/msan_interface.h
@@ -108,7 +108,7 @@ const char *SANITIZER_CDECL __msan_default_options(void);
 
 /* Deprecated. Call __sanitizer_set_death_callback instead. */
 void SANITIZER_CDECL
-__msan_set_death_callback(void (*SANITIZER_CDECL callback)(void));
+__msan_set_death_callback(void(SANITIZER_CDECL *callback)(void));
 
 /* Update shadow for the application copy of size bytes from src to dst.
    Src and dst are application addresses. This function does not copy the