8 files changed, 15 insertions, 14 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_placement_new.h b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
index e506b172e8b..9f794ac0431 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_placement_new.h
+++ b/compiler-rt/lib/sanitizer_common/sanitizer_placement_new.h
@@ -1,4 +1,4 @@
-//===-- tsan_placement_new.h ------------------------------------*- C++ -*-===//
+//===-- sanitizer_placement_new.h -------------------------------*- C++ -*-===//
 //
 //                     The LLVM Compiler Infrastructure
 //
@@ -7,18 +7,19 @@
 //
 //===----------------------------------------------------------------------===//
 //
-// This file is a part of ThreadSanitizer (TSan), a race detector.
+// This file is shared between AddressSanitizer and ThreadSanitizer
+// run-time libraries.
 //
-// The file provides 'placement new'
+// The file provides 'placement new'.
 // Do not include it into header files, only into source files.
 //===----------------------------------------------------------------------===//
-#ifndef TSAN_PLACEMENT_NEW_H
-#define TSAN_PLACEMENT_NEW_H
+#ifndef SANITIZER_PLACEMENT_NEW_H
+#define SANITIZER_PLACEMENT_NEW_H
 
-#include "tsan_defs.h"
+#include "sanitizer_internal_defs.h"
 
 inline void *operator new(__sanitizer::uptr sz, void *p) {
   return p;
 }
 
-#endif  // TSAN_PLACEMENT_NEW_H
+#endif  // SANITIZER_PLACEMENT_NEW_H
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
index 53d1e144db3..723d369a42c 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interceptors.cc
@@ -13,12 +13,12 @@
 
 #include "interception/interception.h"
 #include "sanitizer_common/sanitizer_libc.h"
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_rtl.h"
 #include "tsan_interface.h"
 #include "tsan_atomic.h"
 #include "tsan_platform.h"
 #include "tsan_mman.h"
-#include "tsan_placement_new.h"
 
 using namespace __tsan;  // NOLINT
 
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc b/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
index 07a9ed17cea..b2e199f5025 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_ann.cc
@@ -11,9 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 #include "sanitizer_common/sanitizer_libc.h"
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_interface_ann.h"
 #include "tsan_mutex.h"
-#include "tsan_placement_new.h"
 #include "tsan_report.h"
 #include "tsan_rtl.h"
 #include "tsan_mman.h"
diff --git a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cc b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cc
index 4f3caf7a5d6..a3982a161b9 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_atomic.cc
@@ -11,8 +11,8 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_interface_atomic.h"
-#include "tsan_placement_new.h"
 #include "tsan_flags.h"
 #include "tsan_rtl.h"
 
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
index d1a4b3fcdd0..13847d35cb4 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.cc
@@ -13,13 +13,13 @@
 //===----------------------------------------------------------------------===//
 
 #include "sanitizer_common/sanitizer_libc.h"
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_defs.h"
 #include "tsan_platform.h"
 #include "tsan_rtl.h"
 #include "tsan_interface.h"
 #include "tsan_atomic.h"
 #include "tsan_mman.h"
-#include "tsan_placement_new.h"
 #include "tsan_suppressions.h"
 
 volatile int __tsan_resumed = 0;
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
index ab2dc1e7488..c6832da510d 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_report.cc
@@ -12,6 +12,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "sanitizer_common/sanitizer_libc.h"
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_platform.h"
 #include "tsan_rtl.h"
 #include "tsan_suppressions.h"
@@ -20,7 +21,6 @@
 #include "tsan_sync.h"
 #include "tsan_mman.h"
 #include "tsan_flags.h"
-#include "tsan_placement_new.h"
 
 namespace __sanitizer {
 using namespace __tsan;
diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc b/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
index 67798f14771..147e383b63c 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_rtl_thread.cc
@@ -11,9 +11,9 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_rtl.h"
 #include "tsan_mman.h"
-#include "tsan_placement_new.h"
 #include "tsan_platform.h"
 #include "tsan_report.h"
 #include "tsan_sync.h"
diff --git a/compiler-rt/lib/tsan/rtl/tsan_sync.cc b/compiler-rt/lib/tsan/rtl/tsan_sync.cc
index 0749752640c..e917c5baf15 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_sync.cc
+++ b/compiler-rt/lib/tsan/rtl/tsan_sync.cc
@@ -10,8 +10,8 @@
 // This file is a part of ThreadSanitizer (TSan), a race detector.
 //
 //===----------------------------------------------------------------------===//
+#include "sanitizer_common/sanitizer_placement_new.h"
 #include "tsan_sync.h"
-#include "tsan_placement_new.h"
 #include "tsan_rtl.h"
 #include "tsan_mman.h"