[vm, compiler] Add --target-address-sanitizer.

The throw stub will need to be different under ASAN.

TEST=ci
Bug: #62095
Change-Id: Idd079fbab22d1c3f29c0d7e216998d54a521545c
Reviewed-on: https://dart-review.googlesource.com/c/sdk/+/464786
Reviewed-by: Alexander Aprelev <[email protected]>
Commit-Queue: Ryan Macnak <[email protected]>

Author: rmacnak-google

runtime/BUILD.gn

@@ -112,10 +112,12 @@ config("dart_precompiler_config") {
 
   # In our GN build rules we'll always compile AOT compiler & AOT runtime in
   # the same mode (TSAN or non-TSAN).
-  if (is_tsan) {
-    defines += [ "TARGET_USES_THREAD_SANITIZER" ]
+  if (is_asan && !is_win) {
+    defines += [ "TARGET_USES_ADDRESS_SANITIZER" ]
   } else if (is_msan) {
     defines += [ "TARGET_USES_MEMORY_SANITIZER" ]
+  } else if (is_tsan) {
+    defines += [ "TARGET_USES_THREAD_SANITIZER" ]
   }
 }
 

runtime/tests/vm/dart/sanitizer_compatibility_test.dart

@@ -27,11 +27,12 @@ void checkExists(String path) {
 }
 
 main() async {
-  var sanitizer = find(Platform.executable, ["MSAN", "TSAN"]);
+  var sanitizer = find(Platform.executable, ["ASAN", "MSAN", "TSAN"]);
   var mode = find(Platform.executable, ["Debug", "Release", "Product"]);
   var arch = find(Platform.executable, ["X64", "ARM64", "RISCV64"]);
   var out = find(Platform.executable, ["out", "xcodebuild"]);
   var targetFlag = {
+    "ASAN": "--target_address_sanitizer",
     "MSAN": "--target_memory_sanitizer",
     "TSAN": "--target_thread_sanitizer",
   }[sanitizer]!;

runtime/vm/dart.cc

@@ -7,7 +7,6 @@
 
 #include "vm/dart.h"
 
-#include "platform/thread_sanitizer.h"
 #include "platform/unwinding_records.h"
 
 #include "vm/app_snapshot.h"
@@ -1083,8 +1082,9 @@ char* Dart::FeaturesString(IsolateGroup* isolate_group,
   if (Snapshot::IncludesCode(kind)) {
     VM_GLOBAL_FLAG_LIST(ADD_P, ADD_R, ADD_C, ADD_D);
 
-    ADD_FLAG(tsan, FLAG_target_thread_sanitizer)
+    ADD_FLAG(asan, FLAG_target_address_sanitizer)
     ADD_FLAG(msan, FLAG_target_memory_sanitizer)
+    ADD_FLAG(tsan, FLAG_target_thread_sanitizer)
     ADD_FLAG(shared_data, FLAG_experimental_shared_data)
 
     if (kind == Snapshot::kFullJIT) {

runtime/vm/flag_list.h

@@ -5,7 +5,6 @@
 #ifndef RUNTIME_VM_FLAG_LIST_H_
 #define RUNTIME_VM_FLAG_LIST_H_
 
-#include "platform/thread_sanitizer.h"
 #include "vm/globals.h"
 
 // Don't use USING_PRODUCT outside of this file.

runtime/vm/flags.cc

@@ -74,15 +74,15 @@ FLAG_LIST(PRODUCT_FLAG_MACRO,
 #undef DEBUG_FLAG_MACRO
 
 #if defined(DART_PRECOMPILER)
-#if defined(TARGET_USES_THREAD_SANITIZER)
-constexpr bool kDefaultTargetThreadSanitizer = true;
+#if defined(TARGET_USES_ADDRESS_SANITIZER)
+constexpr bool kDefaultTargetAddressSanitizer = true;
 #else
-constexpr bool kDefaultTargetThreadSanitizer = false;
+constexpr bool kDefaultTargetAddressSanitizer = false;
 #endif
 DEFINE_FLAG(bool,
-            target_thread_sanitizer,
-            kDefaultTargetThreadSanitizer,
-            "Generate Dart code compatible with Thread Sanitizer");
+            target_address_sanitizer,
+            kDefaultTargetAddressSanitizer,
+            "Generate Dart code compatible with Address Sanitizer");
 #if defined(TARGET_USES_MEMORY_SANITIZER)
 constexpr bool kDefaultTargetMemorySanitizer = true;
 #else
@@ -92,6 +92,16 @@ DEFINE_FLAG(bool,
             target_memory_sanitizer,
             kDefaultTargetMemorySanitizer,
             "Generate Dart code compatible with Memory Sanitizer");
+
+#if defined(TARGET_USES_THREAD_SANITIZER)
+constexpr bool kDefaultTargetThreadSanitizer = true;
+#else
+constexpr bool kDefaultTargetThreadSanitizer = false;
+#endif
+DEFINE_FLAG(bool,
+            target_thread_sanitizer,
+            kDefaultTargetThreadSanitizer,
+            "Generate Dart code compatible with Thread Sanitizer");
 #endif
 
 static bool IsMainOrDevChannel() {

runtime/vm/flags.h

@@ -5,6 +5,7 @@
 #ifndef RUNTIME_VM_FLAGS_H_
 #define RUNTIME_VM_FLAGS_H_
 
+#include "platform/address_sanitizer.h"
 #include "platform/assert.h"
 #include "platform/memory_sanitizer.h"
 #include "platform/thread_sanitizer.h"
@@ -162,19 +163,25 @@ FLAG_LIST(PRODUCT_FLAG_MACRO,
 #undef PRECOMPILE_FLAG_MACRO
 
 #if defined(DART_PRECOMPILER)
-DECLARE_FLAG(bool, target_thread_sanitizer);
+DECLARE_FLAG(bool, target_address_sanitizer);
 DECLARE_FLAG(bool, target_memory_sanitizer);
+DECLARE_FLAG(bool, target_thread_sanitizer);
 #else
-#if defined(USING_THREAD_SANITIZER)
-constexpr bool FLAG_target_thread_sanitizer = true;
+#if defined(USING_ADDRESS_SANITIZER)
+constexpr bool FLAG_target_address_sanitizer = true;
 #else
-constexpr bool FLAG_target_thread_sanitizer = false;
+constexpr bool FLAG_target_address_sanitizer = false;
 #endif
 #if defined(USING_MEMORY_SANITIZER)
 constexpr bool FLAG_target_memory_sanitizer = true;
 #else
 constexpr bool FLAG_target_memory_sanitizer = false;
 #endif
+#if defined(USING_THREAD_SANITIZER)
+constexpr bool FLAG_target_thread_sanitizer = true;
+#else
+constexpr bool FLAG_target_thread_sanitizer = false;
+#endif
 #endif
 
 DECLARE_FLAG(bool, experimental_shared_data);