From 6181e5b7ca05a77a1ae366a168d7cd6437fe5b35 Mon Sep 17 00:00:00 2001
From: Michael Lippautz <mlippautz@chromium.org>
Date: Tue, 27 Apr 2021 20:36:42 +0200
Subject: [PATCH] base: Move lsan.h to base/sanitizer/

Bug: chromium:1056170
Change-Id: I470411540fc9d8beaaed52b7aed3c773b9b99b4b
Reviewed-on: https://chromium-review.googlesource.com/c/v8/v8/+/2854739
Auto-Submit: Michael Lippautz <mlippautz@chromium.org>
Commit-Queue: Clemens Backes <clemensb@chromium.org>
Reviewed-by: Clemens Backes <clemensb@chromium.org>
Cr-Commit-Position: refs/heads/master@{#74243}
---
 BUILD.gn                        |  2 +-
 src/base/{ => sanitizer}/lsan.h | 12 +++++++-----
 2 files changed, 8 insertions(+), 6 deletions(-)
 rename src/base/{ => sanitizer}/lsan.h (75%)

diff --git a/BUILD.gn b/BUILD.gn
index 0fe3d31b88..f6953b1403 100644
--- a/BUILD.gn
+++ b/BUILD.gn
@@ -4589,7 +4589,6 @@ v8_component("v8_libbase") {
     "src/base/lazy-instance.h",
     "src/base/logging.cc",
     "src/base/logging.h",
-    "src/base/lsan.h",
     "src/base/macros.h",
     "src/base/memory.h",
     "src/base/once.cc",
@@ -4618,6 +4617,7 @@ v8_component("v8_libbase") {
     "src/base/sanitizer/asan.h",
     "src/base/sanitizer/lsan-page-allocator.cc",
     "src/base/sanitizer/lsan-page-allocator.h",
+    "src/base/sanitizer/lsan.h",
     "src/base/sanitizer/msan.h",
     "src/base/small-vector.h",
     "src/base/sys-info.cc",
diff --git a/src/base/lsan.h b/src/base/sanitizer/lsan.h
similarity index 75%
rename from src/base/lsan.h
rename to src/base/sanitizer/lsan.h
index fd9bbd21c1..2d7dcd7f68 100644
--- a/src/base/lsan.h
+++ b/src/base/sanitizer/lsan.h
@@ -4,14 +4,16 @@
 
 // LeakSanitizer support.
 
-#ifndef V8_BASE_LSAN_H_
-#define V8_BASE_LSAN_H_
+#ifndef V8_BASE_SANITIZER_LSAN_H_
+#define V8_BASE_SANITIZER_LSAN_H_
 
 #include <type_traits>
 
-// There is no compile time flag for LSan, to enable this whenever ASan is
+#include "src/base/macros.h"
+
+// There is no compile time flag for LSan, so enable this whenever ASan is
 // enabled. Note that LSan can be used as part of ASan with 'detect_leaks=1'.
-// On windows, LSan is not implemented yet, so disable it there.
+// On Windows, LSan is not implemented yet, so disable it there.
 #if defined(V8_USE_ADDRESS_SANITIZER) && !defined(V8_OS_WIN)
 
 #include <sanitizer/lsan_interface.h>
@@ -26,4 +28,4 @@
 
 #endif  // defined(V8_USE_ADDRESS_SANITIZER) && !defined(V8_OS_WIN)
 
-#endif  // V8_BASE_LSAN_H_
+#endif  // V8_BASE_SANITIZER_LSAN_H_