[GWP-ASan] IWYU & clang-format
Run an IWYU pass and clang-format GWP-ASan code.
Reviewed By: eugenis, mcgrathr
Differential Revision: https://reviews.llvm.org/D92688
GitOrigin-RevId: 61a038f8528f12c0c2ee5a9794c257fdae626d29
diff --git a/crash_handler.cpp b/crash_handler.cpp
index b9baace..bd7ca5a 100644
--- a/crash_handler.cpp
+++ b/crash_handler.cpp
@@ -10,6 +10,7 @@
#include "gwp_asan/stack_trace_compressor.h"
#include <assert.h>
+#include <stdint.h>
#include <string.h>
using AllocationMetadata = gwp_asan::AllocationMetadata;
diff --git a/guarded_pool_allocator.cpp b/guarded_pool_allocator.cpp
index 13888cb..a1dbbe4 100644
--- a/guarded_pool_allocator.cpp
+++ b/guarded_pool_allocator.cpp
@@ -8,23 +8,10 @@
#include "gwp_asan/guarded_pool_allocator.h"
-#include "gwp_asan/optional/segv_handler.h"
#include "gwp_asan/options.h"
#include "gwp_asan/utilities.h"
-// RHEL creates the PRIu64 format macro (for printing uint64_t's) only when this
-// macro is defined before including <inttypes.h>.
-#ifndef __STDC_FORMAT_MACROS
-#define __STDC_FORMAT_MACROS 1
-#endif
-
#include <assert.h>
-#include <inttypes.h>
-#include <signal.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <time.h>
using AllocationMetadata = gwp_asan::AllocationMetadata;
using Error = gwp_asan::Error;
diff --git a/guarded_pool_allocator.h b/guarded_pool_allocator.h
index 84ebda1..b9972ff 100644
--- a/guarded_pool_allocator.h
+++ b/guarded_pool_allocator.h
@@ -13,10 +13,9 @@
#include "gwp_asan/definitions.h"
#include "gwp_asan/mutex.h"
#include "gwp_asan/options.h"
-#include "gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.h"
-#include "gwp_asan/platform_specific/guarded_pool_allocator_posix.h"
+#include "gwp_asan/platform_specific/guarded_pool_allocator_fuchsia.h" // IWYU pragma: keep
+#include "gwp_asan/platform_specific/guarded_pool_allocator_posix.h" // IWYU pragma: keep
#include "gwp_asan/platform_specific/guarded_pool_allocator_tls.h"
-#include "gwp_asan/stack_trace_compressor.h"
#include <stddef.h>
#include <stdint.h>
diff --git a/mutex.h b/mutex.h
index a7214f5..34b91a2 100644
--- a/mutex.h
+++ b/mutex.h
@@ -9,8 +9,8 @@
#ifndef GWP_ASAN_MUTEX_H_
#define GWP_ASAN_MUTEX_H_
-#include "gwp_asan/platform_specific/mutex_fuchsia.h"
-#include "gwp_asan/platform_specific/mutex_posix.h"
+#include "gwp_asan/platform_specific/mutex_fuchsia.h" // IWYU pragma: keep
+#include "gwp_asan/platform_specific/mutex_posix.h" // IWYU pragma: keep
namespace gwp_asan {
class Mutex final : PlatformMutex {
diff --git a/platform_specific/common_posix.cpp b/platform_specific/common_posix.cpp
index 813882a..0637fc2 100644
--- a/platform_specific/common_posix.cpp
+++ b/platform_specific/common_posix.cpp
@@ -8,7 +8,9 @@
#include "gwp_asan/common.h"
-#include <sys/syscall.h>
+#include <stdint.h>
+#include <sys/syscall.h> // IWYU pragma: keep
+// IWYU pragma: no_include <syscall.h>
#include <unistd.h>
namespace gwp_asan {
diff --git a/platform_specific/guarded_pool_allocator_posix.cpp b/platform_specific/guarded_pool_allocator_posix.cpp
index dad749b..adb7330 100644
--- a/platform_specific/guarded_pool_allocator_posix.cpp
+++ b/platform_specific/guarded_pool_allocator_posix.cpp
@@ -6,16 +6,16 @@
//
//===----------------------------------------------------------------------===//
+#include "gwp_asan/common.h"
#include "gwp_asan/guarded_pool_allocator.h"
+#include "gwp_asan/platform_specific/guarded_pool_allocator_tls.h"
#include "gwp_asan/utilities.h"
#include <assert.h>
-#include <errno.h>
-#include <signal.h>
+#include <pthread.h>
+#include <stdint.h>
#include <stdlib.h>
-#include <string.h>
#include <sys/mman.h>
-#include <sys/types.h>
#include <time.h>
#include <unistd.h>
diff --git a/platform_specific/utilities_posix.cpp b/platform_specific/utilities_posix.cpp
index 7ee7659..28fd22f 100644
--- a/platform_specific/utilities_posix.cpp
+++ b/platform_specific/utilities_posix.cpp
@@ -6,11 +6,6 @@
//
//===----------------------------------------------------------------------===//
-#include "gwp_asan/definitions.h"
-#include "gwp_asan/utilities.h"
-
-#include <assert.h>
-
#ifdef __BIONIC__
#include <stdlib.h>
extern "C" GWP_ASAN_WEAK void android_set_abort_message(const char *);
