Skip to content

[windows][ASan] Fix build #70855

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Oct 31, 2023
Merged

[windows][ASan] Fix build #70855

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b576a7d
[windows][ASan] Fix build
strega-nil Oct 31, 2023
3cbd8ea
format
strega-nil Oct 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions compiler-rt/include/sanitizer/allocator_interface.h
View file
Open in desktop
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
View file
Open in desktop
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
View file
Open in desktop
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