[compiler-rt] [compiler-rt][UBSan][NFC] Reorder includes per coding standard (PR #195435)
via llvm-commits
llvm-commits at lists.llvm.org
Sat May 2 02:03:28 PDT 2026
llvmorg-github-actions[bot] wrote:
<!--LLVM PR SUMMARY COMMENT-->
@llvm/pr-subscribers-compiler-rt-sanitizer
Author: Kleis Auke Wolthuizen (kleisauke)
<details>
<summary>Changes</summary>
---
Full diff: https://github.com/llvm/llvm-project/pull/195435.diff
10 Files Affected:
- (modified) compiler-rt/lib/ubsan/ubsan_diag.cpp (+3-1)
- (modified) compiler-rt/lib/ubsan/ubsan_diag.h (+1)
- (modified) compiler-rt/lib/ubsan/ubsan_flags.cpp (+2-1)
- (modified) compiler-rt/lib/ubsan/ubsan_init.cpp (+4-3)
- (modified) compiler-rt/lib/ubsan/ubsan_init_standalone.cpp (+2-1)
- (modified) compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cpp (+2-1)
- (modified) compiler-rt/lib/ubsan/ubsan_signals_standalone.cpp (+4-3)
- (modified) compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp (+3-2)
- (modified) compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp (+2-2)
- (modified) compiler-rt/lib/ubsan/ubsan_value.cpp (+1)
``````````diff
diff --git a/compiler-rt/lib/ubsan/ubsan_diag.cpp b/compiler-rt/lib/ubsan/ubsan_diag.cpp
index 2146ed3c27287..d883fe7d8f681 100644
--- a/compiler-rt/lib/ubsan/ubsan_diag.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_diag.cpp
@@ -13,15 +13,17 @@
#include "ubsan_platform.h"
#if CAN_SANITIZE_UB
#include "ubsan_diag.h"
-#include "ubsan_init.h"
#include "ubsan_flags.h"
+#include "ubsan_init.h"
#include "ubsan_monitor.h"
+
#include "sanitizer_common/sanitizer_placement_new.h"
#include "sanitizer_common/sanitizer_report_decorator.h"
#include "sanitizer_common/sanitizer_stacktrace.h"
#include "sanitizer_common/sanitizer_stacktrace_printer.h"
#include "sanitizer_common/sanitizer_suppressions.h"
#include "sanitizer_common/sanitizer_symbolizer.h"
+
#include <stdio.h>
using namespace __ubsan;
diff --git a/compiler-rt/lib/ubsan/ubsan_diag.h b/compiler-rt/lib/ubsan/ubsan_diag.h
index d37bc309fdd0a..628dc8388184d 100644
--- a/compiler-rt/lib/ubsan/ubsan_diag.h
+++ b/compiler-rt/lib/ubsan/ubsan_diag.h
@@ -13,6 +13,7 @@
#define UBSAN_DIAG_H
#include "ubsan_value.h"
+
#include "sanitizer_common/sanitizer_stacktrace.h"
#include "sanitizer_common/sanitizer_symbolizer.h"
diff --git a/compiler-rt/lib/ubsan/ubsan_flags.cpp b/compiler-rt/lib/ubsan/ubsan_flags.cpp
index 25cefd46ce27c..f29acad559af5 100644
--- a/compiler-rt/lib/ubsan/ubsan_flags.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_flags.cpp
@@ -13,9 +13,10 @@
#include "ubsan_platform.h"
#if CAN_SANITIZE_UB
#include "ubsan_flags.h"
+
#include "sanitizer_common/sanitizer_common.h"
-#include "sanitizer_common/sanitizer_flags.h"
#include "sanitizer_common/sanitizer_flag_parser.h"
+#include "sanitizer_common/sanitizer_flags.h"
#include <stdlib.h>
diff --git a/compiler-rt/lib/ubsan/ubsan_init.cpp b/compiler-rt/lib/ubsan/ubsan_init.cpp
index aea7ca00e3cb3..334e2d8c7976d 100644
--- a/compiler-rt/lib/ubsan/ubsan_init.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_init.cpp
@@ -12,14 +12,15 @@
#include "ubsan_platform.h"
#if CAN_SANITIZE_UB
+#include "ubsan_init.h"
+#include "ubsan_diag.h"
+#include "ubsan_flags.h"
+
#include "sanitizer_common/sanitizer_common.h"
#include "sanitizer_common/sanitizer_interface_internal.h"
#include "sanitizer_common/sanitizer_libc.h"
#include "sanitizer_common/sanitizer_mutex.h"
#include "sanitizer_common/sanitizer_symbolizer.h"
-#include "ubsan_diag.h"
-#include "ubsan_flags.h"
-#include "ubsan_init.h"
using namespace __ubsan;
diff --git a/compiler-rt/lib/ubsan/ubsan_init_standalone.cpp b/compiler-rt/lib/ubsan/ubsan_init_standalone.cpp
index 5083246b8b7f3..3d81f113f6710 100644
--- a/compiler-rt/lib/ubsan/ubsan_init_standalone.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_init_standalone.cpp
@@ -15,10 +15,11 @@
# error "UBSan is not supported on this platform!"
#endif
-#include "sanitizer_common/sanitizer_internal_defs.h"
#include "ubsan_init.h"
#include "ubsan_signals_standalone.h"
+#include "sanitizer_common/sanitizer_internal_defs.h"
+
#if SANITIZER_FUCHSIA
namespace __sanitizer {
// UBSan doesn't need to do anything else special in the startup hook.
diff --git a/compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cpp b/compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cpp
index 8a2a631834b94..a2a8ed5a8cbae 100644
--- a/compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_init_standalone_preinit.cpp
@@ -15,10 +15,11 @@
#error "UBSan is not supported on this platform!"
#endif
-#include "sanitizer_common/sanitizer_internal_defs.h"
#include "ubsan_init.h"
#include "ubsan_signals_standalone.h"
+#include "sanitizer_common/sanitizer_internal_defs.h"
+
#if SANITIZER_CAN_USE_PREINIT_ARRAY
namespace __ubsan {
diff --git a/compiler-rt/lib/ubsan/ubsan_signals_standalone.cpp b/compiler-rt/lib/ubsan/ubsan_signals_standalone.cpp
index 68edd3a1b2062..301cc186d998d 100644
--- a/compiler-rt/lib/ubsan/ubsan_signals_standalone.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_signals_standalone.cpp
@@ -11,13 +11,14 @@
//===----------------------------------------------------------------------===//
#include "ubsan_platform.h"
-#include "sanitizer_common/sanitizer_platform.h"
#if CAN_SANITIZE_UB
-#include "interception/interception.h"
-#include "sanitizer_common/sanitizer_stacktrace.h"
#include "ubsan_diag.h"
#include "ubsan_init.h"
+#include "interception/interception.h"
+#include "sanitizer_common/sanitizer_platform.h"
+#include "sanitizer_common/sanitizer_stacktrace.h"
+
// Interception of signals breaks too many things on Android.
// * It requires that ubsan is the first dependency of the main executable for
// the interceptors to work correctly. This complicates deployment, as it
diff --git a/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp b/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
index 15788574dd995..965c9a8cf9498 100644
--- a/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_type_hash_itanium.cpp
@@ -10,13 +10,14 @@
//
//===----------------------------------------------------------------------===//
-#include "sanitizer_common/sanitizer_platform.h"
#include "ubsan_platform.h"
#if CAN_SANITIZE_UB && !defined(_MSC_VER)
#include "ubsan_type_hash.h"
#include "sanitizer_common/sanitizer_common.h"
#include "sanitizer_common/sanitizer_ptrauth.h"
+#include "sanitizer_common/sanitizer_platform.h"
+
#include <stdint.h>
// The following are intended to be binary compatible with the definitions
@@ -278,4 +279,4 @@ bool __ubsan::checkTypeInfoEquality(const void *TypeInfo1,
TI2->name()[0] != '*' && !internal_strcmp(TI1->name(), TI2->name());
}
-#endif // CAN_SANITIZE_UB && !SANITIZER_WINDOWS
+#endif // CAN_SANITIZE_UB && !defined(_MSC_VER)
diff --git a/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp b/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp
index 106fa1b85a558..877f18979fea1 100644
--- a/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_type_hash_win.cpp
@@ -10,12 +10,12 @@
//
//===----------------------------------------------------------------------===//
-#include "sanitizer_common/sanitizer_platform.h"
#include "ubsan_platform.h"
#if CAN_SANITIZE_UB && defined(_MSC_VER)
#include "ubsan_type_hash.h"
#include "sanitizer_common/sanitizer_common.h"
+#include "sanitizer_common/sanitizer_platform.h"
#include <typeinfo>
@@ -81,4 +81,4 @@ bool __ubsan::checkTypeInfoEquality(const void *, const void *) {
return false;
}
-#endif // CAN_SANITIZE_UB && SANITIZER_WINDOWS
+#endif // CAN_SANITIZE_UB && defined(_MSC_VER)
diff --git a/compiler-rt/lib/ubsan/ubsan_value.cpp b/compiler-rt/lib/ubsan/ubsan_value.cpp
index 6e88ebaf34d4b..50501ac75b2b6 100644
--- a/compiler-rt/lib/ubsan/ubsan_value.cpp
+++ b/compiler-rt/lib/ubsan/ubsan_value.cpp
@@ -14,6 +14,7 @@
#include "ubsan_platform.h"
#if CAN_SANITIZE_UB
#include "ubsan_value.h"
+
#include "sanitizer_common/sanitizer_common.h"
#include "sanitizer_common/sanitizer_libc.h"
#include "sanitizer_common/sanitizer_mutex.h"
``````````
</details>
https://github.com/llvm/llvm-project/pull/195435
More information about the llvm-commits
mailing list