[compiler-rt] [llvm] [compiler-rt][sanitizer] add Haiku support (PR #134772)
via llvm-commits
llvm-commits at lists.llvm.org
Mon Apr 7 20:01:20 PDT 2025
github-actions[bot] wrote:
<!--LLVM CODE FORMAT COMMENT: {clang-format}-->
:warning: C/C++ code formatter, clang-format found issues in your code. :warning:
<details>
<summary>
You can test this locally with the following command:
</summary>
``````````bash
git-clang-format --diff HEAD~1 HEAD --extensions inc,cpp,h -- compiler-rt/lib/sanitizer_common/sanitizer_haiku.cpp compiler-rt/lib/sanitizer_common/sanitizer_procmaps_haiku.cpp compiler-rt/lib/asan/asan_linux.cpp compiler-rt/lib/asan/asan_malloc_linux.cpp compiler-rt/lib/asan/asan_posix.cpp compiler-rt/lib/asan/tests/asan_test.cpp compiler-rt/lib/interception/interception.h compiler-rt/lib/interception/interception_linux.cpp compiler-rt/lib/interception/interception_linux.h compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc compiler-rt/lib/sanitizer_common/sanitizer_errno.h compiler-rt/lib/sanitizer_common/sanitizer_errno_codes.h compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp compiler-rt/lib/sanitizer_common/sanitizer_linux.h compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp compiler-rt/lib/sanitizer_common/sanitizer_platform.h compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h compiler-rt/lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cpp compiler-rt/lib/ubsan/ubsan_platform.h llvm/lib/Transforms/Instrumentation/AddressSanitizer.cpp
``````````
</details>
<details>
<summary>
View the diff from clang-format here.
</summary>
``````````diff
diff --git a/compiler-rt/lib/asan/asan_linux.cpp b/compiler-rt/lib/asan/asan_linux.cpp
index b3aa3ead1..b5b4d88d1 100644
--- a/compiler-rt/lib/asan/asan_linux.cpp
+++ b/compiler-rt/lib/asan/asan_linux.cpp
@@ -26,9 +26,9 @@
# include <stdio.h>
# include <sys/mman.h>
# include <sys/resource.h>
-#if !SANITIZER_HAIKU
-# include <sys/syscall.h>
-#endif
+# if !SANITIZER_HAIKU
+# include <sys/syscall.h>
+# endif
# include <sys/time.h>
# include <sys/types.h>
# include <unistd.h>
@@ -61,7 +61,7 @@
# include <link_elf.h>
# include <ucontext.h>
# elif SANITIZER_HAIKU
-extern "C" void* _DYNAMIC;
+extern "C" void *_DYNAMIC;
# else
# include <link.h>
# include <sys/ucontext.h>
@@ -173,7 +173,7 @@ static int FindFirstDSOCallback(struct dl_phdr_info *info, size_t size,
# if SANITIZER_HAIKU
if (!info->dlpi_name[0] ||
internal_strncmp(info->dlpi_name, "/boot/system/runtime_loader",
- sizeof("/boot/system/runtime_loader") - 1) == 0)
+ sizeof("/boot/system/runtime_loader") - 1) == 0)
return 0;
# endif
# if SANITIZER_LINUX
diff --git a/compiler-rt/lib/interception/interception.h b/compiler-rt/lib/interception/interception.h
index 25480120e..4a7ff6e33 100644
--- a/compiler-rt/lib/interception/interception.h
+++ b/compiler-rt/lib/interception/interception.h
@@ -370,9 +370,9 @@ inline void DoesNotSupportStaticLinking() {}
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \
SANITIZER_SOLARIS || SANITIZER_HAIKU
-# include "interception_linux.h"
-# define INTERCEPT_FUNCTION(func) INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)
-# define INTERCEPT_FUNCTION_VER(func, symver) \
+# include "interception_linux.h"
+# define INTERCEPT_FUNCTION(func) INTERCEPT_FUNCTION_LINUX_OR_FREEBSD(func)
+# define INTERCEPT_FUNCTION_VER(func, symver) \
INTERCEPT_FUNCTION_VER_LINUX_OR_FREEBSD(func, symver)
#elif SANITIZER_APPLE
# include "interception_mac.h"
diff --git a/compiler-rt/lib/interception/interception_linux.cpp b/compiler-rt/lib/interception/interception_linux.cpp
index 0a6659d38..b03e9c524 100644
--- a/compiler-rt/lib/interception/interception_linux.cpp
+++ b/compiler-rt/lib/interception/interception_linux.cpp
@@ -16,7 +16,7 @@
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \
SANITIZER_SOLARIS || SANITIZER_HAIKU
-#include <dlfcn.h> // for dlsym() and dlvsym()
+# include <dlfcn.h> // for dlsym() and dlvsym()
namespace __interception {
diff --git a/compiler-rt/lib/interception/interception_linux.h b/compiler-rt/lib/interception/interception_linux.h
index 52e34d535..f78ccc13e 100644
--- a/compiler-rt/lib/interception/interception_linux.h
+++ b/compiler-rt/lib/interception/interception_linux.h
@@ -14,12 +14,12 @@
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \
SANITIZER_SOLARIS || SANITIZER_HAIKU
-#if !defined(INCLUDED_FROM_INTERCEPTION_LIB)
-# error interception_linux.h should be included from interception library only
-#endif
+# if !defined(INCLUDED_FROM_INTERCEPTION_LIB)
+# error interception_linux.h should be included from interception library only
+# endif
-#ifndef INTERCEPTION_LINUX_H
-#define INTERCEPTION_LINUX_H
+# ifndef INTERCEPTION_LINUX_H
+# define INTERCEPTION_LINUX_H
namespace __interception {
bool InterceptFunction(const char *name, uptr *ptr_to_real, uptr func,
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
index f88f914b1..5b3df83f8 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_common_interceptors_ioctl.inc
@@ -49,27 +49,27 @@ static void ioctl_table_fill() {
}
_(FIONBIO, READ, sizeof(int));
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
_(FIOASYNC, READ, sizeof(int));
_(FIOCLEX, NONE, 0);
_(FIOGETOWN, WRITE, sizeof(int));
_(FIONCLEX, NONE, 0);
_(FIOSETOWN, READ, sizeof(int));
-#endif
+# endif
_(SIOCATMARK, WRITE, sizeof(int));
_(SIOCGIFCONF, CUSTOM, 0);
_(SIOCGPGRP, WRITE, sizeof(int));
_(SIOCSPGRP, READ, sizeof(int));
-#if !SANITIZER_SOLARIS && !SANITIZER_HAIKU
+# if !SANITIZER_SOLARIS && !SANITIZER_HAIKU
_(TIOCCONS, NONE, 0);
#endif
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
_(TIOCGETD, WRITE, sizeof(int));
_(TIOCNOTTY, NONE, 0);
_(TIOCPKT, READ, sizeof(int));
_(TIOCSETD, READ, sizeof(int));
_(TIOCSTI, READ, sizeof(char));
-#endif
+# endif
_(TIOCEXCL, NONE, 0);
_(TIOCGPGRP, WRITE, pid_t_sz);
_(TIOCGWINSZ, WRITE, struct_winsize_sz);
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_errno_codes.h b/compiler-rt/lib/sanitizer_common/sanitizer_errno_codes.h
index c2ea52b84..10a98a9b4 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_errno_codes.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_errno_codes.h
@@ -22,19 +22,19 @@
namespace __sanitizer {
#ifdef __HAIKU__
-#define errno_ENOMEM (0x80000000)
-#define errno_EBUSY (0x80000000 + 14)
-#define errno_EINVAL (0x80000000 + 5)
-#define errno_ERANGE (0x80007000 + 17)
-#define errno_ENAMETOOLONG (0x80000000 + 0x6004)
-#define errno_ENOSYS (0x80007009)
+# define errno_ENOMEM (0x80000000)
+# define errno_EBUSY (0x80000000 + 14)
+# define errno_EINVAL (0x80000000 + 5)
+# define errno_ERANGE (0x80007000 + 17)
+# define errno_ENAMETOOLONG (0x80000000 + 0x6004)
+# define errno_ENOSYS (0x80007009)
#else
-#define errno_ENOMEM 12
-#define errno_EBUSY 16
-#define errno_EINVAL 22
-#define errno_ERANGE 34
-#define errno_ENAMETOOLONG 36
-#define errno_ENOSYS 38
+# define errno_ENOMEM 12
+# define errno_EBUSY 16
+# define errno_EINVAL 22
+# define errno_ERANGE 34
+# define errno_ENAMETOOLONG 36
+# define errno_ENOSYS 38
#endif
// Those might not present or their value differ on different platforms.
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_haiku.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_haiku.cpp
index 9b7217754..3578ec439 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_haiku.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_haiku.cpp
@@ -14,37 +14,34 @@
#if SANITIZER_HAIKU
-#include "sanitizer_common.h"
-#include "sanitizer_flags.h"
-#include "sanitizer_getauxval.h"
-#include "sanitizer_internal_defs.h"
-#include "sanitizer_libc.h"
-#include "sanitizer_linux.h"
-#include "sanitizer_mutex.h"
-#include "sanitizer_placement_new.h"
-#include "sanitizer_procmaps.h"
-
-#include <sys/param.h>
-#include <sys/types.h>
-
-#include <sys/mman.h>
-#include <sys/resource.h>
-#include <sys/stat.h>
-#include <sys/time.h>
-
-#include <dlfcn.h>
-#include <errno.h>
-#include <fcntl.h>
-#include <limits.h>
-#include <link.h>
-#include <pthread.h>
-#include <sched.h>
-#include <signal.h>
-#include <unistd.h>
-
-#include "system/vm_defs.h"
-#include "system/syscalls.h"
-#include "shared/syscall_utils.h"
+# include <dlfcn.h>
+# include <errno.h>
+# include <fcntl.h>
+# include <limits.h>
+# include <link.h>
+# include <pthread.h>
+# include <sched.h>
+# include <signal.h>
+# include <sys/mman.h>
+# include <sys/param.h>
+# include <sys/resource.h>
+# include <sys/stat.h>
+# include <sys/time.h>
+# include <sys/types.h>
+# include <unistd.h>
+
+# include "sanitizer_common.h"
+# include "sanitizer_flags.h"
+# include "sanitizer_getauxval.h"
+# include "sanitizer_internal_defs.h"
+# include "sanitizer_libc.h"
+# include "sanitizer_linux.h"
+# include "sanitizer_mutex.h"
+# include "sanitizer_placement_new.h"
+# include "sanitizer_procmaps.h"
+# include "shared/syscall_utils.h"
+# include "system/syscalls.h"
+# include "system/vm_defs.h"
namespace __sanitizer {
@@ -59,13 +56,13 @@ static void *GetRealLibcAddress(const char *symbol) {
return real;
}
-#define _REAL(func, ...) real##_##func(__VA_ARGS__)
-#define DEFINE__REAL(ret_type, func, ...) \
- static ret_type (*real_##func)(__VA_ARGS__) = NULL; \
- if (!real_##func) { \
- real_##func = (ret_type(*)(__VA_ARGS__))GetRealLibcAddress(#func); \
- } \
- CHECK(real_##func);
+# define _REAL(func, ...) real##_##func(__VA_ARGS__)
+# define DEFINE__REAL(ret_type, func, ...) \
+ static ret_type (*real_##func)(__VA_ARGS__) = NULL; \
+ if (!real_##func) { \
+ real_##func = (ret_type(*)(__VA_ARGS__))GetRealLibcAddress(#func); \
+ } \
+ CHECK(real_##func);
// --------------- sanitizer_libc.h
uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd,
@@ -73,8 +70,8 @@ uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd,
if ((flags & MAP_ANONYMOUS) != 0)
fd = -1;
- int mapping = (flags & MAP_SHARED) != 0
- ? REGION_NO_PRIVATE_MAP : REGION_PRIVATE_MAP;
+ int mapping =
+ (flags & MAP_SHARED) != 0 ? REGION_NO_PRIVATE_MAP : REGION_PRIVATE_MAP;
uint32 addressSpec;
if ((flags & MAP_FIXED) != 0)
@@ -96,7 +93,7 @@ uptr internal_mmap(void *addr, uptr length, int prot, int flags, int fd,
areaProtection |= B_OVERCOMMITTING_AREA;
area_id area = _kern_map_file("sanitizer mmap", &addr, addressSpec, length,
- areaProtection, mapping, true, fd, offset);
+ areaProtection, mapping, true, fd, offset);
if (area < 0)
RETURN_AND_SET_ERRNO(area);
return (uptr)addr;
@@ -226,11 +223,11 @@ void internal_usleep(u64 useconds) {
uptr internal_execve(const char *filename, char *const argv[],
char *const envp[]) {
- DEFINE__REAL(int, execve, const char*, char*const[], char*const[]);
+ DEFINE__REAL(int, execve, const char *, char *const[], char *const[]);
return _REAL(execve, filename, argv, envp);
}
-#if 0
+# if 0
tid_t GetTid() {
DEFINE__REAL(int, _lwp_self);
return _REAL(_lwp_self);
@@ -249,7 +246,7 @@ u64 NanoTime() {
_REAL(__gettimeofday50, &tv, 0);
return (u64)tv.tv_sec * 1000 * 1000 * 1000 + tv.tv_usec * 1000;
}
-#endif
+# endif
uptr internal_clock_gettime(__sanitizer_clockid_t clk_id, void *tp) {
DEFINE__REAL(int, __clock_gettime50, __sanitizer_clockid_t a, void *b);
@@ -262,7 +259,7 @@ uptr internal_ptrace(int request, int pid, void *addr, int data) {
}
uptr internal_waitpid(int pid, int *status, int options) {
- DEFINE__REAL(int, waitpid, pid_t, int*, int);
+ DEFINE__REAL(int, waitpid, pid_t, int *, int);
return _REAL(waitpid, pid, status, options);
}
@@ -312,13 +309,13 @@ int internal_fork() {
return _REAL(fork);
}
-#if 0
+# if 0
int internal_sysctl(const int *name, unsigned int namelen, void *oldp,
uptr *oldlenp, const void *newp, uptr newlen) {
CHECK(&__sysctl);
return __sysctl(name, namelen, oldp, (size_t *)oldlenp, newp, (size_t)newlen);
}
-#endif
+# endif
int internal_sysctlbyname(const char *sname, void *oldp, uptr *oldlenp,
const void *newp, uptr newlen) {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
index cadd79de9..f2988e9de 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cpp
@@ -126,7 +126,7 @@ extern struct ps_strings *__ps_strings;
# include <OS.h>
# include <elf.h>
# include <image.h>
-extern "C" char** __libc_argv;
+extern "C" char **__libc_argv;
# endif
extern char **environ;
@@ -687,7 +687,8 @@ u64 NanoTime() {
// 'environ' array (on some others) and does not use libc. This function
// should be called first inside __asan_init.
const char *GetEnv(const char *name) {
-# if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_SOLARIS || SANITIZER_HAIKU
+# if SANITIZER_FREEBSD || SANITIZER_NETBSD || SANITIZER_SOLARIS || \
+ SANITIZER_HAIKU
if (::environ != 0) {
uptr NameLen = internal_strlen(name);
for (char **Env = ::environ; *Env != 0; Env++) {
@@ -725,7 +726,8 @@ const char *GetEnv(const char *name) {
# endif
}
-# if !SANITIZER_HAIKU && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && !SANITIZER_GO
+# if !SANITIZER_HAIKU && !SANITIZER_FREEBSD && !SANITIZER_NETBSD && \
+ !SANITIZER_GO
extern "C" {
SANITIZER_WEAK_ATTRIBUTE extern void *__libc_stack_end;
}
@@ -1288,7 +1290,7 @@ uptr ReadBinaryName(/*out*/ char *buf, uptr buf_len) {
if (info.type != B_APP_IMAGE)
continue;
argv0 = info.name;
- break;
+ break;
}
internal_strncpy(buf, argv0, buf_len);
return internal_strlen(buf);
@@ -2643,7 +2645,7 @@ static void GetPcSpBp(void *context, uptr *pc, uptr *sp, uptr *bp) {
*bp = ucontext->uc_mcontext.mc_rbp;
*sp = ucontext->uc_mcontext.mc_rsp;
# elif SANITIZER_HAIKU
- ucontext_t *ucontext = (ucontext_t*)context;
+ ucontext_t *ucontext = (ucontext_t *)context;
*pc = ucontext->uc_mcontext.rip;
*bp = ucontext->uc_mcontext.rbp;
*sp = ucontext->uc_mcontext.rsp;
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
index 35453385a..99dc12a76 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux_libcdep.cpp
@@ -722,13 +722,13 @@ static int AddModuleSegments(const char *module_name, dl_phdr_info *info,
if (phdr->p_type == PT_LOAD) {
uptr cur_beg = info->dlpi_addr + phdr->p_vaddr;
uptr cur_end = cur_beg + phdr->p_memsz;
-#if SANITIZER_HAIKU
+# if SANITIZER_HAIKU
bool executable = phdr->p_flags & PF_EXECUTE;
bool writable = phdr->p_flags & PF_WRITE;
-#else
+# else
bool executable = phdr->p_flags & PF_X;
bool writable = phdr->p_flags & PF_W;
-#endif
+# endif
cur_module.addAddressRange(cur_beg, cur_end, executable, writable);
} else if (phdr->p_type == PT_NOTE) {
# ifdef NT_GNU_BUILD_ID
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
index af79e9916..9f5f41cd8 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform.h
@@ -142,7 +142,7 @@
# define SANITIZER_MUSL 0
#endif
-#define SANITIZER_POSIX \
+#define SANITIZER_POSIX \
(SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_APPLE || \
SANITIZER_NETBSD || SANITIZER_SOLARIS || SANITIZER_HAIKU)
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
index 28503ff48..641f44dfe 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.cpp
@@ -52,50 +52,50 @@
#include <time.h>
#include <wchar.h>
#include <regex.h>
-#if !SANITIZER_APPLE && !SANITIZER_HAIKU
-#include <utmp.h>
-#endif
+# if !SANITIZER_APPLE && !SANITIZER_HAIKU
+# include <utmp.h>
+# endif
-#if !SANITIZER_IOS
-#include <net/route.h>
-#endif
+# if !SANITIZER_IOS
+# include <net/route.h>
+# endif
-#if !SANITIZER_ANDROID
-#if !SANITIZER_HAIKU
-#include <sys/mount.h>
-#endif
-#include <sys/timeb.h>
-#include <utmpx.h>
-#endif
+# if !SANITIZER_ANDROID
+# if !SANITIZER_HAIKU
+# include <sys/mount.h>
+# endif
+# include <sys/timeb.h>
+# include <utmpx.h>
+# endif
-#if SANITIZER_LINUX
-#include <malloc.h>
-#include <mntent.h>
-#include <netinet/ether.h>
-#include <sys/sysinfo.h>
-#include <sys/vt.h>
-#include <linux/cdrom.h>
-#include <linux/fd.h>
-#if SANITIZER_ANDROID
-#include <linux/fs.h>
-#endif
-#include <linux/hdreg.h>
-#include <linux/input.h>
-#include <linux/ioctl.h>
-#include <linux/soundcard.h>
-#include <linux/sysctl.h>
-#include <linux/utsname.h>
-#include <linux/posix_types.h>
-#include <net/if_arp.h>
-#endif
+# if SANITIZER_LINUX
+# include <malloc.h>
+# include <mntent.h>
+# include <netinet/ether.h>
+# include <sys/sysinfo.h>
+# include <sys/vt.h>
+# include <linux/cdrom.h>
+# include <linux/fd.h>
+# if SANITIZER_ANDROID
+# include <linux/fs.h>
+# endif
+# include <linux/hdreg.h>
+# include <linux/input.h>
+# include <linux/ioctl.h>
+# include <linux/soundcard.h>
+# include <linux/sysctl.h>
+# include <linux/utsname.h>
+# include <linux/posix_types.h>
+# include <net/if_arp.h>
+# endif
-#if SANITIZER_IOS
-#undef IOC_DIRMASK
-#endif
+# if SANITIZER_IOS
+# undef IOC_DIRMASK
+# endif
-#if SANITIZER_LINUX
-# include <utime.h>
-# include <sys/ptrace.h>
+# if SANITIZER_LINUX
+# include <utime.h>
+# include <sys/ptrace.h>
# if defined(__mips64) || defined(__aarch64__) || defined(__arm__) || \
defined(__hexagon__) || defined(__loongarch__) || SANITIZER_RISCV64 || \
defined(__sparc__)
@@ -113,15 +113,15 @@ typedef struct user_fpregs elf_fpregset_t;
#if !SANITIZER_ANDROID
#include <ifaddrs.h>
-#if !SANITIZER_HAIKU
-#include <sys/ucontext.h>
-#include <wordexp.h>
-#endif
-#endif
+# if !SANITIZER_HAIKU
+# include <sys/ucontext.h>
+# include <wordexp.h>
+# endif
+# endif
-#if SANITIZER_LINUX
-#if SANITIZER_GLIBC
-#include <fstab.h>
+# if SANITIZER_LINUX
+# if SANITIZER_GLIBC
+# include <fstab.h>
# include <linux/filter.h>
# include <net/if_ppp.h>
# include <netax25/ax25.h>
@@ -132,55 +132,55 @@ typedef struct user_fpregs elf_fpregset_t;
# include <rpc/xdr.h>
# endif
# include <scsi/scsi.h>
-#else
-#include <linux/if_ppp.h>
-#include <linux/kd.h>
-#include <linux/ppp_defs.h>
-#endif // SANITIZER_GLIBC
-
-#if SANITIZER_ANDROID
-#include <linux/mtio.h>
-#else
-#include <glob.h>
-#include <mqueue.h>
-#include <sys/kd.h>
-#include <sys/mtio.h>
-#include <sys/shm.h>
-#include <sys/statvfs.h>
-#include <sys/timex.h>
-#if defined(__mips64)
-# include <sys/procfs.h>
-#endif
-#include <sys/user.h>
-#include <linux/if_eql.h>
-#include <linux/if_plip.h>
-#include <linux/lp.h>
-#include <linux/mroute.h>
-#include <linux/mroute6.h>
-#include <linux/scc.h>
-#include <linux/serial.h>
-#include <sys/msg.h>
-#include <sys/ipc.h>
-#endif // SANITIZER_ANDROID
-
-#include <link.h>
-#include <sys/vfs.h>
-#include <sys/epoll.h>
-#include <linux/capability.h>
-#elif !SANITIZER_HAIKU
-#include <fstab.h>
-#endif // SANITIZER_LINUX
+# else
+# include <linux/if_ppp.h>
+# include <linux/kd.h>
+# include <linux/ppp_defs.h>
+# endif // SANITIZER_GLIBC
-#if SANITIZER_APPLE
-#include <net/ethernet.h>
-#include <sys/filio.h>
-#include <sys/sockio.h>
-#endif
+# if SANITIZER_ANDROID
+# include <linux/mtio.h>
+# else
+# include <glob.h>
+# include <mqueue.h>
+# include <sys/kd.h>
+# include <sys/mtio.h>
+# include <sys/shm.h>
+# include <sys/statvfs.h>
+# include <sys/timex.h>
+# if defined(__mips64)
+# include <sys/procfs.h>
+# endif
+# include <sys/user.h>
+# include <linux/if_eql.h>
+# include <linux/if_plip.h>
+# include <linux/lp.h>
+# include <linux/mroute.h>
+# include <linux/mroute6.h>
+# include <linux/scc.h>
+# include <linux/serial.h>
+# include <sys/msg.h>
+# include <sys/ipc.h>
+# endif // SANITIZER_ANDROID
+
+# include <link.h>
+# include <sys/vfs.h>
+# include <sys/epoll.h>
+# include <linux/capability.h>
+# elif !SANITIZER_HAIKU
+# include <fstab.h>
+# endif // SANITIZER_LINUX
+
+# if SANITIZER_APPLE
+# include <net/ethernet.h>
+# include <sys/filio.h>
+# include <sys/sockio.h>
+# endif
-#if SANITIZER_HAIKU
-#include <sys/sockio.h>
-#include <sys/ioctl.h>
-#endif
+# if SANITIZER_HAIKU
+# include <sys/ioctl.h>
+# include <sys/sockio.h>
+# endif
// Include these after system headers to avoid name clashes and ambiguities.
# include "sanitizer_common.h"
@@ -226,7 +226,7 @@ namespace __sanitizer {
unsigned struct_fstab_sz = sizeof(struct fstab);
#endif // SANITIZER_GLIBC || SANITIZER_FREEBSD || SANITIZER_NETBSD ||
// SANITIZER_APPLE
-#if !SANITIZER_ANDROID && !SANITIZER_HAIKU
+# if !SANITIZER_ANDROID && !SANITIZER_HAIKU
unsigned struct_statfs_sz = sizeof(struct statfs);
unsigned struct_sockaddr_sz = sizeof(struct sockaddr);
@@ -333,7 +333,7 @@ namespace __sanitizer {
int shmctl_shm_stat = (int)SHM_STAT;
#endif
-#if !SANITIZER_APPLE && !SANITIZER_FREEBSD && !SANITIZER_HAIKU
+# if !SANITIZER_APPLE && !SANITIZER_FREEBSD && !SANITIZER_HAIKU
unsigned struct_utmp_sz = sizeof(struct utmp);
#endif
#if !SANITIZER_ANDROID
@@ -561,13 +561,13 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
const unsigned IOCTL_NOT_PRESENT = 0;
unsigned IOCTL_FIONBIO = FIONBIO;
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
unsigned IOCTL_FIOASYNC = FIOASYNC;
unsigned IOCTL_FIOCLEX = FIOCLEX;
unsigned IOCTL_FIOGETOWN = FIOGETOWN;
unsigned IOCTL_FIONCLEX = FIONCLEX;
unsigned IOCTL_FIOSETOWN = FIOSETOWN;
-#endif
+# endif
unsigned IOCTL_SIOCADDMULTI = SIOCADDMULTI;
unsigned IOCTL_SIOCATMARK = SIOCATMARK;
unsigned IOCTL_SIOCDELMULTI = SIOCDELMULTI;
@@ -589,14 +589,14 @@ unsigned struct_ElfW_Phdr_sz = sizeof(Elf_Phdr);
unsigned IOCTL_SIOCSIFNETMASK = SIOCSIFNETMASK;
unsigned IOCTL_SIOCSPGRP = SIOCSPGRP;
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
unsigned IOCTL_TIOCCONS = TIOCCONS;
unsigned IOCTL_TIOCGETD = TIOCGETD;
unsigned IOCTL_TIOCNOTTY = TIOCNOTTY;
unsigned IOCTL_TIOCPKT = TIOCPKT;
unsigned IOCTL_TIOCSETD = TIOCSETD;
unsigned IOCTL_TIOCSTI = TIOCSTI;
-#endif
+# endif
unsigned IOCTL_TIOCEXCL = TIOCEXCL;
unsigned IOCTL_TIOCGPGRP = TIOCGPGRP;
@@ -1118,11 +1118,11 @@ COMPILER_CHECK(sizeof(__sanitizer_dirent) <= sizeof(dirent));
CHECK_SIZE_AND_OFFSET(dirent, d_ino);
#if SANITIZER_APPLE
CHECK_SIZE_AND_OFFSET(dirent, d_seekoff);
-#elif SANITIZER_FREEBSD || SANITIZER_HAIKU
+# elif SANITIZER_FREEBSD || SANITIZER_HAIKU
// There is no 'd_off' field on FreeBSD.
-#else
+# else
CHECK_SIZE_AND_OFFSET(dirent, d_off);
-#endif
+# endif
CHECK_SIZE_AND_OFFSET(dirent, d_reclen);
#if SANITIZER_GLIBC
@@ -1134,9 +1134,9 @@ CHECK_SIZE_AND_OFFSET(dirent64, d_reclen);
CHECK_TYPE_SIZE(ifconf);
CHECK_SIZE_AND_OFFSET(ifconf, ifc_len);
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
CHECK_SIZE_AND_OFFSET(ifconf, ifc_ifcu);
-#endif
+# endif
CHECK_TYPE_SIZE(pollfd);
CHECK_SIZE_AND_OFFSET(pollfd, fd);
@@ -1191,7 +1191,7 @@ CHECK_TYPE_SIZE(__kernel_loff_t);
CHECK_TYPE_SIZE(__kernel_fd_set);
#endif
-#if !SANITIZER_ANDROID && !SANITIZER_HAIKU
+# if !SANITIZER_ANDROID && !SANITIZER_HAIKU
CHECK_TYPE_SIZE(wordexp_t);
CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordc);
CHECK_SIZE_AND_OFFSET(wordexp_t, we_wordv);
@@ -1221,11 +1221,11 @@ CHECK_SIZE_AND_OFFSET(mntent, mnt_freq);
CHECK_SIZE_AND_OFFSET(mntent, mnt_passno);
#endif
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
CHECK_TYPE_SIZE(ether_addr);
-#endif
+# endif
-#if SANITIZER_GLIBC || SANITIZER_FREEBSD
+# if SANITIZER_GLIBC || SANITIZER_FREEBSD
CHECK_TYPE_SIZE(ipc_perm);
# if SANITIZER_FREEBSD
CHECK_SIZE_AND_OFFSET(ipc_perm, key);
@@ -1261,7 +1261,7 @@ CHECK_TYPE_SIZE(clock_t);
CHECK_TYPE_SIZE(clockid_t);
#endif
-#if !SANITIZER_ANDROID && !SANITIZER_HAIKU
+# if !SANITIZER_ANDROID && !SANITIZER_HAIKU
CHECK_TYPE_SIZE(ifaddrs);
CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_next);
CHECK_SIZE_AND_OFFSET(ifaddrs, ifa_name);
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
index 26de940f9..52f5a5ee5 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_platform_limits_posix.h
@@ -16,25 +16,25 @@
#if SANITIZER_LINUX || SANITIZER_APPLE || SANITIZER_HAIKU
-#include "sanitizer_internal_defs.h"
-#include "sanitizer_platform.h"
-#include "sanitizer_mallinfo.h"
-
-#if SANITIZER_APPLE
-#include <sys/cdefs.h>
-#if !__DARWIN_ONLY_64_BIT_INO_T
-#define SANITIZER_HAS_STAT64 1
-#define SANITIZER_HAS_STATFS64 1
-#else
-#define SANITIZER_HAS_STAT64 0
-#define SANITIZER_HAS_STATFS64 0
-#endif
-#elif SANITIZER_GLIBC || SANITIZER_ANDROID
-#define SANITIZER_HAS_STAT64 1
-#define SANITIZER_HAS_STATFS64 1
-#endif
+# include "sanitizer_internal_defs.h"
+# include "sanitizer_platform.h"
+# include "sanitizer_mallinfo.h"
+
+# if SANITIZER_APPLE
+# include <sys/cdefs.h>
+# if !__DARWIN_ONLY_64_BIT_INO_T
+# define SANITIZER_HAS_STAT64 1
+# define SANITIZER_HAS_STATFS64 1
+# else
+# define SANITIZER_HAS_STAT64 0
+# define SANITIZER_HAS_STATFS64 0
+# endif
+# elif SANITIZER_GLIBC || SANITIZER_ANDROID
+# define SANITIZER_HAS_STAT64 1
+# define SANITIZER_HAS_STATFS64 1
+# endif
-#if defined(__sparc__)
+# if defined(__sparc__)
// FIXME: This can't be included from tsan which does not support sparc yet.
#include "sanitizer_glibc_version.h"
#endif
@@ -366,7 +366,7 @@ struct __sanitizer_passwd {
long pw_change;
char *pw_class;
#endif
-#if !(SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)) && !SANITIZER_HAIKU
+# if !(SANITIZER_ANDROID && (SANITIZER_WORDSIZE == 32)) && !SANITIZER_HAIKU
char *pw_gecos;
#endif
char *pw_dir;
@@ -374,9 +374,9 @@ struct __sanitizer_passwd {
#if SANITIZER_APPLE
long pw_expire;
#endif
-#if SANITIZER_HAIKU
+# if SANITIZER_HAIKU
char *pw_gecos;
-#endif
+# endif
};
struct __sanitizer_group {
@@ -436,11 +436,11 @@ struct __sanitizer_tm {
int tm_wday;
int tm_yday;
int tm_isdst;
-#if SANITIZER_HAIKU
+# if SANITIZER_HAIKU
int tm_gmtoff;
-#else
+# else
long int tm_gmtoff;
-#endif
+# endif
const char *tm_zone;
};
@@ -461,7 +461,7 @@ struct __sanitizer_file_handle {
};
#endif
-#if SANITIZER_APPLE || SANITIZER_HAIKU
+# if SANITIZER_APPLE || SANITIZER_HAIKU
struct __sanitizer_msghdr {
void *msg_name;
unsigned msg_namelen;
@@ -509,7 +509,7 @@ struct __sanitizer_dirent {
unsigned short d_reclen;
// more fields that we don't care about
};
-#elif SANITIZER_HAIKU
+# elif SANITIZER_HAIKU
struct __sanitizer_dirent {
int d_dev;
int d_pdev;
@@ -545,15 +545,15 @@ struct __sanitizer_dirent64 {
extern unsigned struct_sock_fprog_sz;
#endif
-#if SANITIZER_HAIKU
+# if SANITIZER_HAIKU
typedef int __sanitizer_clock_t;
-#elif defined(__x86_64__) && !defined(_LP64)
+# elif defined(__x86_64__) && !defined(_LP64)
typedef long long __sanitizer_clock_t;
-#else
+# else
typedef long __sanitizer_clock_t;
-#endif
+# endif
-#if SANITIZER_LINUX || SANITIZER_HAIKU
+# if SANITIZER_LINUX || SANITIZER_HAIKU
typedef int __sanitizer_clockid_t;
typedef unsigned long long __sanitizer_eventfd_t;
#endif
@@ -602,14 +602,14 @@ typedef unsigned long __sanitizer_sigset_t;
# endif
#elif SANITIZER_APPLE
typedef unsigned __sanitizer_sigset_t;
-#elif SANITIZER_HAIKU
+# elif SANITIZER_HAIKU
typedef unsigned long __sanitizer_sigset_t;
-#elif SANITIZER_LINUX
+# elif SANITIZER_LINUX
struct __sanitizer_sigset_t {
// The size is determined by looking at sizeof of real sigset_t on linux.
uptr val[128 / sizeof(uptr)];
};
-#endif
+# endif
struct __sanitizer_siginfo_pad {
#if SANITIZER_X32
@@ -799,7 +799,7 @@ struct __sanitizer_addrinfo {
int ai_family;
int ai_socktype;
int ai_protocol;
-#if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_HAIKU
+# if SANITIZER_ANDROID || SANITIZER_APPLE || SANITIZER_HAIKU
unsigned ai_addrlen;
char *ai_canonname;
void *ai_addr;
@@ -1148,14 +1148,14 @@ extern unsigned IOCTL_SIOCSIFMETRIC;
extern unsigned IOCTL_SIOCSIFMTU;
extern unsigned IOCTL_SIOCSIFNETMASK;
extern unsigned IOCTL_SIOCSPGRP;
-#if !SANITIZER_HAIKU
+# if !SANITIZER_HAIKU
extern unsigned IOCTL_TIOCCONS;
extern unsigned IOCTL_TIOCGETD;
extern unsigned IOCTL_TIOCNOTTY;
extern unsigned IOCTL_TIOCPKT;
extern unsigned IOCTL_TIOCSETD;
extern unsigned IOCTL_TIOCSTI;
-#endif
+# endif
extern unsigned IOCTL_TIOCEXCL;
extern unsigned IOCTL_TIOCGPGRP;
extern unsigned IOCTL_TIOCGWINSZ;
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
index a9be974c1..18be13471 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps.h
@@ -16,15 +16,15 @@
#include "sanitizer_platform.h"
#if SANITIZER_LINUX || SANITIZER_FREEBSD || SANITIZER_NETBSD || \
- SANITIZER_APPLE || SANITIZER_SOLARIS || SANITIZER_HAIKU || \
+ SANITIZER_APPLE || SANITIZER_SOLARIS || SANITIZER_HAIKU || \
SANITIZER_FUCHSIA
-#include "sanitizer_common.h"
-#include "sanitizer_internal_defs.h"
-#include "sanitizer_fuchsia.h"
-#include "sanitizer_linux.h"
-#include "sanitizer_mac.h"
-#include "sanitizer_mutex.h"
+# include "sanitizer_common.h"
+# include "sanitizer_internal_defs.h"
+# include "sanitizer_fuchsia.h"
+# include "sanitizer_linux.h"
+# include "sanitizer_mac.h"
+# include "sanitizer_mutex.h"
namespace __sanitizer {
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_haiku.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_haiku.cpp
index befb55720..530faeee4 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_haiku.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_procmaps_haiku.cpp
@@ -12,10 +12,10 @@
#include "sanitizer_platform.h"
#if SANITIZER_HAIKU
-#include "sanitizer_common.h"
-#include "sanitizer_procmaps.h"
+# include <kernel/OS.h>
-#include <kernel/OS.h>
+# include "sanitizer_common.h"
+# include "sanitizer_procmaps.h"
namespace __sanitizer {
@@ -27,15 +27,12 @@ void MemoryMappedSegment::AddAddressRanges(LoadedModule *module) {
MemoryMappingLayout::MemoryMappingLayout(bool) { Reset(); }
-void MemoryMappingLayout::Reset() {
- data_.cookie = 0;
-}
+void MemoryMappingLayout::Reset() { data_.cookie = 0; }
MemoryMappingLayout::~MemoryMappingLayout() {}
// static
-void MemoryMappingLayout::CacheMemoryMappings() {
-}
+void MemoryMappingLayout::CacheMemoryMappings() {}
bool MemoryMappingLayout::Next(MemoryMappedSegment *segment) {
area_info info;
@@ -92,6 +89,6 @@ void MemoryMappingLayout::DumpListOfModules(
void GetMemoryProfile(fill_profile_f cb, uptr *stats) {}
-} // namespace __sanitizer
+} // namespace __sanitizer
#endif
diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cpp b/compiler-rt/lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
index 3f6901a2e..db0f619c7 100644
--- a/compiler-rt/lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_unwind_linux_libcdep.cpp
@@ -13,17 +13,17 @@
#include "sanitizer_platform.h"
#if SANITIZER_FREEBSD || SANITIZER_LINUX || SANITIZER_NETBSD || \
SANITIZER_SOLARIS || SANITIZER_HAIKU
-#include "sanitizer_common.h"
-#include "sanitizer_stacktrace.h"
+# include "sanitizer_common.h"
+# include "sanitizer_stacktrace.h"
-#if SANITIZER_ANDROID
-#include <dlfcn.h> // for dlopen()
-#endif
+# if SANITIZER_ANDROID
+# include <dlfcn.h> // for dlopen()
+# endif
-#if SANITIZER_FREEBSD
-#define _GNU_SOURCE // to declare _Unwind_Backtrace() from <unwind.h>
-#endif
-#include <unwind.h>
+# if SANITIZER_FREEBSD
+# define _GNU_SOURCE // to declare _Unwind_Backtrace() from <unwind.h>
+# endif
+# include <unwind.h>
namespace __sanitizer {
``````````
</details>
https://github.com/llvm/llvm-project/pull/134772
More information about the llvm-commits
mailing list