[nsan] Make #include more conventional

Author: MaskRay

compiler-rt/lib/nsan/nsan.cpp

@@ -30,6 +30,11 @@
 //
 //===----------------------------------------------------------------------===//
 
+#include "nsan.h"
+#include "nsan_flags.h"
+#include "nsan_stats.h"
+#include "nsan_suppressions.h"
+
 #include <assert.h>
 #include <math.h>
 #include <stdint.h>
@@ -43,11 +48,6 @@
 #include "sanitizer_common/sanitizer_stacktrace.h"
 #include "sanitizer_common/sanitizer_symbolizer.h"
 
-#include "nsan/nsan.h"
-#include "nsan/nsan_flags.h"
-#include "nsan/nsan_stats.h"
-#include "nsan/nsan_suppressions.h"
-
 using namespace __sanitizer;
 using namespace __nsan;
 

compiler-rt/lib/nsan/nsan.h

@@ -86,8 +86,8 @@ inline const u8 *GetShadowTypeAddrFor(const u8 *Ptr) {
 template <typename FT> struct FTInfo {};
 template <> struct FTInfo<float> {
   using orig_type = float;
-  using orig_bits_type = __sanitizer::u32;
-  using mantissa_bits_type = __sanitizer::u32;
+  using orig_bits_type = u32;
+  using mantissa_bits_type = u32;
   using shadow_type = double;
   static const char *kCppTypeName;
   static constexpr unsigned kMantissaBits = 23;
@@ -104,8 +104,8 @@ template <> struct FTInfo<float> {
 };
 template <> struct FTInfo<double> {
   using orig_type = double;
-  using orig_bits_type = __sanitizer::u64;
-  using mantissa_bits_type = __sanitizer::u64;
+  using orig_bits_type = u64;
+  using mantissa_bits_type = u64;
   using shadow_type = __float128;
   static const char *kCppTypeName;
   static constexpr unsigned kMantissaBits = 52;
@@ -126,7 +126,7 @@ template <> struct FTInfo<double> {
 };
 template <> struct FTInfo<long double> {
   using orig_type = long double;
-  using mantissa_bits_type = __sanitizer::u64;
+  using mantissa_bits_type = u64;
   using shadow_type = __float128;
   static const char *kCppTypeName;
   static constexpr unsigned kMantissaBits = 63;

compiler-rt/lib/nsan/nsan_interceptors.cpp

@@ -16,7 +16,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "interception/interception.h"
-#include "nsan/nsan.h"
+#include "nsan.h"
 #include "sanitizer_common/sanitizer_common.h"
 
 #include <wchar.h>

compiler-rt/lib/nsan/nsan_malloc_linux.cpp

@@ -11,7 +11,7 @@
 //===----------------------------------------------------------------------===//
 
 #include "interception/interception.h"
-#include "nsan/nsan.h"
+#include "nsan.h"
 #include "sanitizer_common/sanitizer_allocator_dlsym.h"
 #include "sanitizer_common/sanitizer_common.h"
 #include "sanitizer_common/sanitizer_platform.h"

compiler-rt/lib/nsan/nsan_preinit.cpp

@@ -10,7 +10,7 @@
 //
 //===----------------------------------------------------------------------===//
 
-#include "nsan/nsan.h"
+#include "nsan.h"
 #include "sanitizer_common/sanitizer_internal_defs.h"
 
 #if SANITIZER_CAN_USE_PREINIT_ARRAY

compiler-rt/lib/nsan/nsan_stats.cpp

@@ -11,7 +11,7 @@
 // NumericalStabilitySanitizer statistics.
 //===----------------------------------------------------------------------===//
 
-#include "nsan/nsan_stats.h"
+#include "nsan_stats.h"
 
 #include "sanitizer_common/sanitizer_common.h"
 #include "sanitizer_common/sanitizer_placement_new.h"

compiler-rt/lib/sanitizer_common/sanitizer_internal_defs.h

@@ -457,6 +457,9 @@ using namespace __sanitizer;
 namespace __msan {
 using namespace __sanitizer;
 }
+namespace __nsan {
+using namespace __sanitizer;
+}
 namespace __hwasan {
 using namespace __sanitizer;
 }