[compiler-rt] [rtsan][NFC] Move away from system include style for local headers (PR #109977)
Chris Apple via llvm-commits
llvm-commits at lists.llvm.org
Wed Sep 25 06:28:45 PDT 2024
https://github.com/cjappl updated https://github.com/llvm/llvm-project/pull/109977
>From b6ea8ed52cb59495f492a09193f7c89703dc9176 Mon Sep 17 00:00:00 2001
From: Chris Apple <cja-private at pm.me>
Date: Wed, 25 Sep 2024 06:14:42 -0700
Subject: [PATCH 1/2] [rtsan][NFC] Move away from system include style for
local headers
---
compiler-rt/lib/rtsan/rtsan.cpp | 10 +++++-----
compiler-rt/lib/rtsan/rtsan_context.cpp | 6 +++---
compiler-rt/lib/rtsan/rtsan_context.h | 2 --
compiler-rt/lib/rtsan/rtsan_preinit.cpp | 2 +-
compiler-rt/lib/rtsan/tests/rtsan_test_functional.cpp | 7 ++++---
.../lib/rtsan/tests/rtsan_test_interceptors.cpp | 4 ++--
6 files changed, 15 insertions(+), 16 deletions(-)
diff --git a/compiler-rt/lib/rtsan/rtsan.cpp b/compiler-rt/lib/rtsan/rtsan.cpp
index 1e10069f51dd3b..f02e89421035ca 100644
--- a/compiler-rt/lib/rtsan/rtsan.cpp
+++ b/compiler-rt/lib/rtsan/rtsan.cpp
@@ -8,11 +8,11 @@
//
//===----------------------------------------------------------------------===//
-#include <rtsan/rtsan.h>
-#include <rtsan/rtsan_assertions.h>
-#include <rtsan/rtsan_diagnostics.h>
-#include <rtsan/rtsan_flags.h>
-#include <rtsan/rtsan_interceptors.h>
+#include "rtsan/rtsan.h"
+#include "rtsan/rtsan_assertions.h"
+#include "rtsan/rtsan_diagnostics.h"
+#include "rtsan/rtsan_flags.h"
+#include "rtsan/rtsan_interceptors.h"
#include "sanitizer_common/sanitizer_atomic.h"
#include "sanitizer_common/sanitizer_common.h"
diff --git a/compiler-rt/lib/rtsan/rtsan_context.cpp b/compiler-rt/lib/rtsan/rtsan_context.cpp
index 37ac817db76e44..f2d4ef963dd812 100644
--- a/compiler-rt/lib/rtsan/rtsan_context.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_context.cpp
@@ -8,10 +8,10 @@
//
//===----------------------------------------------------------------------===//
-#include <rtsan/rtsan.h>
-#include <rtsan/rtsan_context.h>
+#include "rtsan/rtsan.h"
+#include "rtsan/rtsan_context.h"
-#include <sanitizer_common/sanitizer_allocator_internal.h>
+#include "sanitizer_common/sanitizer_allocator_internal.h"
#include <new>
#include <pthread.h>
diff --git a/compiler-rt/lib/rtsan/rtsan_context.h b/compiler-rt/lib/rtsan/rtsan_context.h
index 8512017793a48c..cb0c2eb0a5e0d7 100644
--- a/compiler-rt/lib/rtsan/rtsan_context.h
+++ b/compiler-rt/lib/rtsan/rtsan_context.h
@@ -10,8 +10,6 @@
#pragma once
-#include <sanitizer_common/sanitizer_internal_defs.h>
-
namespace __rtsan {
class Context {
diff --git a/compiler-rt/lib/rtsan/rtsan_preinit.cpp b/compiler-rt/lib/rtsan/rtsan_preinit.cpp
index 1307268951fbcd..cff2b87cc67a39 100644
--- a/compiler-rt/lib/rtsan/rtsan_preinit.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_preinit.cpp
@@ -9,7 +9,7 @@
//===----------------------------------------------------------------------===//
#include "sanitizer_common/sanitizer_internal_defs.h"
-#include <rtsan/rtsan.h>
+#include "rtsan/rtsan.h"
#if SANITIZER_CAN_USE_PREINIT_ARRAY
diff --git a/compiler-rt/lib/rtsan/tests/rtsan_test_functional.cpp b/compiler-rt/lib/rtsan/tests/rtsan_test_functional.cpp
index dff3c527350fdf..9e455f0326a549 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_functional.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_functional.cpp
@@ -15,9 +15,10 @@
#include "gtest/gtest.h"
#include "rtsan_test_utilities.h"
-#include <rtsan.h>
-#include <sanitizer_common/sanitizer_platform.h>
-#include <sanitizer_common/sanitizer_platform_interceptors.h>
+
+#include "rtsan/rtsan.h"
+#include "sanitizer_common/sanitizer_platform.h"
+#include "sanitizer_common/sanitizer_platform_interceptors.h"
#include <array>
#include <atomic>
diff --git a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors.cpp b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors.cpp
index e96d3758bcaf86..c65b1bb01fbe01 100644
--- a/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors.cpp
+++ b/compiler-rt/lib/rtsan/tests/rtsan_test_interceptors.cpp
@@ -10,8 +10,8 @@
#include "gtest/gtest.h"
-#include <sanitizer_common/sanitizer_platform.h>
-#include <sanitizer_common/sanitizer_platform_interceptors.h>
+#include "sanitizer_common/sanitizer_platform.h"
+#include "sanitizer_common/sanitizer_platform_interceptors.h"
#include "rtsan_test_utilities.h"
>From 734a3f287278a2dffafc231fe91ea08324e15abb Mon Sep 17 00:00:00 2001
From: Chris Apple <cja-private at pm.me>
Date: Wed, 25 Sep 2024 06:28:33 -0700
Subject: [PATCH 2/2] [PR] code style
---
compiler-rt/lib/rtsan/rtsan_context.cpp | 2 +-
compiler-rt/lib/rtsan/rtsan_preinit.cpp | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/compiler-rt/lib/rtsan/rtsan_context.cpp b/compiler-rt/lib/rtsan/rtsan_context.cpp
index f2d4ef963dd812..1cf1791f0aaf83 100644
--- a/compiler-rt/lib/rtsan/rtsan_context.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_context.cpp
@@ -8,8 +8,8 @@
//
//===----------------------------------------------------------------------===//
-#include "rtsan/rtsan.h"
#include "rtsan/rtsan_context.h"
+#include "rtsan/rtsan.h"
#include "sanitizer_common/sanitizer_allocator_internal.h"
diff --git a/compiler-rt/lib/rtsan/rtsan_preinit.cpp b/compiler-rt/lib/rtsan/rtsan_preinit.cpp
index cff2b87cc67a39..5d49223bc8bebc 100644
--- a/compiler-rt/lib/rtsan/rtsan_preinit.cpp
+++ b/compiler-rt/lib/rtsan/rtsan_preinit.cpp
@@ -8,8 +8,8 @@
//
//===----------------------------------------------------------------------===//
-#include "sanitizer_common/sanitizer_internal_defs.h"
#include "rtsan/rtsan.h"
+#include "sanitizer_common/sanitizer_internal_defs.h"
#if SANITIZER_CAN_USE_PREINIT_ARRAY
More information about the llvm-commits
mailing list