[vm] Fix using GCC with the sanitizers.

TEST=local
Change-Id: Icb47e2c68e55ae14f806cb421b8d860cda4d1f1c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/350647
Reviewed-by: Alexander Aprelev <[email protected]>
Commit-Queue: Ryan Macnak <[email protected]>

Author: rmacnak-google

build/config/BUILDCONFIG.gn

@@ -216,13 +216,7 @@ if (current_os == "win") {
 # BUILD OPTIONS
 # =============================================================================
 
-# These Sanitizers all imply using the Clang compiler. On Windows they either
-# don't work or work differently.
-if (!is_clang && (is_asan || is_lsan || is_msan || is_tsan || is_ubsan)) {
-  is_clang = true
-}
-
-use_flutter_cxx = is_msan || is_tsan
+use_flutter_cxx = is_clang && (is_msan || is_tsan)
 
 # =============================================================================
 # TARGET DEFAULTS

build/config/compiler/BUILD.gn

@@ -113,9 +113,6 @@ config("compiler") {
 
     # Common options for AddressSanitizer, LeakSanitizer, ThreadSanitizer and
     # MemorySanitizer
-    if (using_sanitizer) {
-      cflags += [ "-gline-tables-only" ]
-    }
     if (is_asan) {
       cflags += [ "-fsanitize=address" ]
       ldflags += [ "-fsanitize=address" ]

runtime/bin/dart_embedder_api_impl.cc

@@ -19,14 +19,14 @@ namespace embedder {
 static char* MallocFormatedString(const char* format, ...) {
   va_list measure_args;
   va_start(measure_args, format);
-  intptr_t len = vsnprintf(nullptr, 0, format, measure_args);
+  intptr_t len = Utils::VSNPrint(nullptr, 0, format, measure_args);
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(malloc(len + 1));
   MSAN_UNPOISON(buffer, (len + 1));
   va_list print_args;
   va_start(print_args, format);
-  vsnprintf(buffer, (len + 1), format, print_args);
+  Utils::VSNPrint(buffer, (len + 1), format, print_args);
   va_end(print_args);
   return buffer;
 }

runtime/bin/dartutils.cc

@@ -774,14 +774,14 @@ Dart_Handle DartUtils::NewDartIOException(const char* exception_name,
 Dart_Handle DartUtils::NewError(const char* format, ...) {
   va_list measure_args;
   va_start(measure_args, format);
-  intptr_t len = vsnprintf(nullptr, 0, format, measure_args);
+  intptr_t len = Utils::VSNPrint(nullptr, 0, format, measure_args);
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(Dart_ScopeAllocate(len + 1));
   MSAN_UNPOISON(buffer, (len + 1));
   va_list print_args;
   va_start(print_args, format);
-  vsnprintf(buffer, (len + 1), format, print_args);
+  Utils::VSNPrint(buffer, (len + 1), format, print_args);
   va_end(print_args);
 
   return Dart_NewApiError(buffer);
@@ -802,7 +802,7 @@ Dart_Handle DartUtils::NewStringFormatted(const char* format, ...) {
 char* DartUtils::ScopedCStringVFormatted(const char* format, va_list args) {
   va_list measure_args;
   va_copy(measure_args, args);
-  intptr_t len = vsnprintf(nullptr, 0, format, measure_args);
+  intptr_t len = Utils::VSNPrint(nullptr, 0, format, measure_args);
   if (len < 0) {
     return nullptr;
   }
@@ -812,7 +812,7 @@ char* DartUtils::ScopedCStringVFormatted(const char* format, va_list args) {
   MSAN_UNPOISON(buffer, (len + 1));
   va_list print_args;
   va_copy(print_args, args);
-  len = vsnprintf(buffer, (len + 1), format, print_args);
+  len = Utils::VSNPrint(buffer, (len + 1), format, print_args);
   if (len < 0) {
     return nullptr;
   }

runtime/bin/file_fuchsia.cc

@@ -132,15 +132,15 @@ bool File::VPrint(const char* format, va_list args) {
   // Measure.
   va_list measure_args;
   va_copy(measure_args, args);
-  intptr_t len = vsnprintf(nullptr, 0, format, measure_args);
+  intptr_t len = Utils::VSNPrint(nullptr, 0, format, measure_args);
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(malloc(len + 1));
 
   // Print.
   va_list print_args;
   va_copy(print_args, args);
-  vsnprintf(buffer, len + 1, format, print_args);
+  Utils::VSNPrint(buffer, len + 1, format, print_args);
   va_end(print_args);
 
   bool result = WriteFully(buffer, len);

runtime/bin/file_linux.cc

@@ -143,15 +143,15 @@ bool File::VPrint(const char* format, va_list args) {
   // Measure.
   va_list measure_args;
   va_copy(measure_args, args);
-  intptr_t len = vsnprintf(nullptr, 0, format, measure_args);
+  intptr_t len = Utils::VSNPrint(nullptr, 0, format, measure_args);
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(malloc(len + 1));
 
   // Print.
   va_list print_args;
   va_copy(print_args, args);
-  vsnprintf(buffer, len + 1, format, print_args);
+  Utils::VSNPrint(buffer, len + 1, format, print_args);
   va_end(print_args);
 
   bool result = WriteFully(buffer, len);

runtime/bin/file_macos.cc

@@ -175,15 +175,15 @@ bool File::VPrint(const char* format, va_list args) {
   // Measure.
   va_list measure_args;
   va_copy(measure_args, args);
-  intptr_t len = vsnprintf(nullptr, 0, format, measure_args);
+  intptr_t len = Utils::VSNPrint(nullptr, 0, format, measure_args);
   va_end(measure_args);
 
   char* buffer = reinterpret_cast<char*>(malloc(len + 1));
 
   // Print.
   va_list print_args;
   va_copy(print_args, args);
-  vsnprintf(buffer, len + 1, format, print_args);
+  Utils::VSNPrint(buffer, len + 1, format, print_args);
   va_end(print_args);
 
   bool result = WriteFully(buffer, len);

runtime/platform/address_sanitizer.h

@@ -9,7 +9,9 @@
 
 // Allow the use of ASan (AddressSanitizer). This is needed as ASan needs to be
 // told about areas where the VM does the equivalent of a long-jump.
-#if defined(__has_feature)
+#if __SANITIZE_ADDRESS__
+#define USING_ADDRESS_SANITIZER
+#elif defined(__has_feature)
 #if __has_feature(address_sanitizer)
 #define USING_ADDRESS_SANITIZER
 #endif

runtime/platform/atomic.h

@@ -122,15 +122,15 @@ class AcqRelAtomic {
       T& expected,  // NOLINT
       T desired,
       std::memory_order success_order = std::memory_order_acq_rel,
-      std::memory_order failure_order = std::memory_order_seq_cst) {
+      std::memory_order failure_order = std::memory_order_acquire) {
     return value_.compare_exchange_weak(expected, desired, success_order,
                                         failure_order);
   }
   bool compare_exchange_strong(
       T& expected,  // NOLINT
       T desired,
       std::memory_order success_order = std::memory_order_acq_rel,
-      std::memory_order failure_order = std::memory_order_seq_cst) {
+      std::memory_order failure_order = std::memory_order_acquire) {
     return value_.compare_exchange_strong(expected, desired, success_order,
                                           failure_order);
   }

runtime/platform/leak_sanitizer.h

@@ -7,7 +7,9 @@
 
 #include "platform/globals.h"
 
-#if defined(__has_feature)
+#if __SANITIZE_ADDRESS__
+#define USING_LEAK_SANITIZER
+#elif defined(__has_feature)
 #if __has_feature(leak_sanitizer) || __has_feature(address_sanitizer)
 #define USING_LEAK_SANITIZER
 #endif

runtime/platform/thread_sanitizer.h

@@ -7,7 +7,9 @@
 
 #include "platform/globals.h"
 
-#if defined(__has_feature)
+#if __SANITIZE_THREAD__
+#define USING_THREAD_SANITIZER
+#elif defined(__has_feature)
 #if __has_feature(thread_sanitizer)
 #define USING_THREAD_SANITIZER
 #endif

runtime/platform/unaligned.h

@@ -10,33 +10,19 @@
 
 namespace dart {
 
-#if defined(HOST_ARCH_ARM) || defined(HOST_ARCH_ARM64)
 template <typename T>
 static inline T LoadUnaligned(const T* ptr) {
   T value;
-  memcpy(reinterpret_cast<void*>(&value), reinterpret_cast<const void*>(ptr),
-         sizeof(value));
+  memcpy(reinterpret_cast<void*>(&value),  // NOLINT
+         reinterpret_cast<const void*>(ptr), sizeof(value));
   return value;
 }
 
 template <typename T>
 static inline void StoreUnaligned(T* ptr, T value) {
-  memcpy(reinterpret_cast<void*>(ptr), reinterpret_cast<const void*>(&value),
-         sizeof(value));
+  memcpy(reinterpret_cast<void*>(ptr),  // NOLINT
+         reinterpret_cast<const void*>(&value), sizeof(value));
 }
-#else   // !(HOST_ARCH_ARM || HOST_ARCH_ARM64)
-template <typename T>
-NO_SANITIZE_UNDEFINED("alignment")
-static inline T LoadUnaligned(const T* ptr) {
-  return *ptr;
-}
-
-template <typename T>
-NO_SANITIZE_UNDEFINED("alignment")
-static inline void StoreUnaligned(T* ptr, T value) {
-  *ptr = value;
-}
-#endif  // !(HOST_ARCH_ARM || HOST_ARCH_ARM64)
 
 }  // namespace dart
 

runtime/platform/undefined_behavior_sanitizer.h

@@ -5,7 +5,9 @@
 #ifndef RUNTIME_PLATFORM_UNDEFINED_BEHAVIOR_SANITIZER_H_
 #define RUNTIME_PLATFORM_UNDEFINED_BEHAVIOR_SANITIZER_H_
 
-#if defined(__has_feature)
+#if __SANITIZE_UNDEFINED__
+#define USING_UNDEFINED_BEHAVIOR_SANITIZER
+#elif defined(__has_feature)
 #if __has_feature(undefined_behavior_sanitizer)
 #define USING_UNDEFINED_BEHAVIOR_SANITIZER
 #endif

runtime/vm/native_api_impl.cc

@@ -113,8 +113,6 @@ DART_EXPORT bool Dart_CloseNativePort(Dart_Port native_port_id) {
   return was_closed;
 }
 
-static Monitor* vm_service_calls_monitor = new Monitor();
-
 DART_EXPORT bool Dart_InvokeVMServiceMethod(uint8_t* request_json,
                                             intptr_t request_json_length,
                                             uint8_t** response_json,
@@ -133,6 +131,7 @@ DART_EXPORT bool Dart_InvokeVMServiceMethod(uint8_t* request_json,
   // We only allow one isolate reload at a time.  If this turns out to be on the
   // critical path, we can change it to have a global datastructure which is
   // mapping the reply ports to receive buffers.
+  static Monitor* vm_service_calls_monitor = new Monitor();
   MonitorLocker _(vm_service_calls_monitor);
 
   static Monitor* vm_service_call_monitor = new Monitor();