Skip to content

Commit

Permalink
[windows][ASan] Fix build (#70855)
Browse files Browse the repository at this point in the history
PR #69625 broke the build - I put __cdecl on the wrong side of the `*`
in function pointer declarations.

Lesson learned - run check-all!
  • Loading branch information
strega-nil committed Oct 31, 2023
1 parent 89a2e70 commit 15b0cb4
Show file tree
Hide file tree
Showing 3 changed files with 7 additions and 7 deletions.
4 changes: 2 additions & 2 deletions compiler-rt/include/sanitizer/allocator_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
8 changes: 4 additions & 4 deletions compiler-rt/include/sanitizer/dfsan_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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);

Expand Down
2 changes: 1 addition & 1 deletion compiler-rt/include/sanitizer/msan_interface.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down

0 comments on commit 15b0cb4

Please sign in to comment.