[vm] Symbolize JIT Dart frames for TSAN.

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

Author: rmacnak-google

runtime/platform/thread_sanitizer.h

@@ -35,6 +35,16 @@ extern "C" void __tsan_write2(void* addr);
 extern "C" void __tsan_write4(void* addr);
 extern "C" void __tsan_write8(void* addr);
 extern "C" void __tsan_write16(void* addr);
+extern "C" void __tsan_read1_pc(void* addr, void* pc);
+extern "C" void __tsan_read2_pc(void* addr, void* pc);
+extern "C" void __tsan_read4_pc(void* addr, void* pc);
+extern "C" void __tsan_read8_pc(void* addr, void* pc);
+extern "C" void __tsan_read16_pc(void* addr, void* pc);
+extern "C" void __tsan_write1_pc(void* addr, void* pc);
+extern "C" void __tsan_write2_pc(void* addr, void* pc);
+extern "C" void __tsan_write4_pc(void* addr, void* pc);
+extern "C" void __tsan_write8_pc(void* addr, void* pc);
+extern "C" void __tsan_write16_pc(void* addr, void* pc);
 extern "C" void __tsan_func_entry(void* pc);
 extern "C" void __tsan_func_exit();
 #else

runtime/vm/compiler/assembler/assembler_arm64.cc

@@ -353,56 +353,6 @@ void Assembler::TsanStoreRelease(Register src,
   }
 }
 
-void Assembler::TsanRead(Register addr, intptr_t size) {
-  Comment("TsanRead");
-  LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true);
-  MoveRegister(R0, addr);
-  switch (size) {
-    case 1:
-      rt.Call(kTsanRead1RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 2:
-      rt.Call(kTsanRead2RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 4:
-      rt.Call(kTsanRead4RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 8:
-      rt.Call(kTsanRead8RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 16:
-      rt.Call(kTsanRead16RuntimeEntry, /*argument_count=*/1);
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-void Assembler::TsanWrite(Register addr, intptr_t size) {
-  Comment("TsanWrite");
-  LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true);
-  MoveRegister(R0, addr);
-  switch (size) {
-    case 1:
-      rt.Call(kTsanWrite1RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 2:
-      rt.Call(kTsanWrite2RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 4:
-      rt.Call(kTsanWrite4RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 8:
-      rt.Call(kTsanWrite8RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 16:
-      rt.Call(kTsanWrite16RuntimeEntry, /*argument_count=*/1);
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
 void Assembler::TsanFuncEntry(bool preserve_registers) {
   Comment("TsanFuncEntry");
   LeafRuntimeScope rt(this, /*frame_size=*/0, preserve_registers);

runtime/vm/compiler/assembler/assembler_arm64.h

@@ -504,8 +504,6 @@ class Assembler : public AssemblerBase {
 
   void TsanLoadAcquire(Register dst, Register addr, OperandSize size);
   void TsanStoreRelease(Register src, Register addr, OperandSize size);
-  void TsanRead(Register addr, intptr_t size);
-  void TsanWrite(Register addr, intptr_t size);
   void TsanFuncEntry(bool preserve_registers = true);
   void TsanFuncExit(bool preserve_registers = true);
 

runtime/vm/compiler/assembler/assembler_riscv.cc

@@ -3172,56 +3172,6 @@ void Assembler::TsanStoreRelease(Register src,
   }
 }
 
-void Assembler::TsanRead(Register addr, intptr_t size) {
-  Comment("TsanRead");
-  LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true);
-  MoveRegister(A0, addr);
-  switch (size) {
-    case 1:
-      rt.Call(kTsanRead1RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 2:
-      rt.Call(kTsanRead2RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 4:
-      rt.Call(kTsanRead4RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 8:
-      rt.Call(kTsanRead8RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 16:
-      rt.Call(kTsanRead16RuntimeEntry, /*argument_count=*/1);
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-void Assembler::TsanWrite(Register addr, intptr_t size) {
-  Comment("TsanWrite");
-  LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true);
-  MoveRegister(A0, addr);
-  switch (size) {
-    case 1:
-      rt.Call(kTsanWrite1RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 2:
-      rt.Call(kTsanWrite2RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 4:
-      rt.Call(kTsanWrite4RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 8:
-      rt.Call(kTsanWrite8RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 16:
-      rt.Call(kTsanWrite16RuntimeEntry, /*argument_count=*/1);
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
 void Assembler::TsanFuncEntry(bool preserve_registers) {
   Comment("TsanFuncEntry");
   LeafRuntimeScope rt(this, /*frame_size=*/0, preserve_registers);

runtime/vm/compiler/assembler/assembler_riscv.h

@@ -1009,8 +1009,6 @@ class Assembler : public MicroAssembler {
 
   void TsanLoadAcquire(Register dst, const Address& address, OperandSize size);
   void TsanStoreRelease(Register src, const Address& address, OperandSize size);
-  void TsanRead(Register addr, intptr_t size);
-  void TsanWrite(Register addr, intptr_t size);
   void TsanFuncEntry(bool preserve_registers = true);
   void TsanFuncExit(bool preserve_registers = true);
 

runtime/vm/compiler/assembler/assembler_x64.cc

@@ -2210,56 +2210,6 @@ void Assembler::TsanStoreRelease(Register src, Address addr, OperandSize size) {
   }
 }
 
-void Assembler::TsanRead(Register addr, intptr_t size) {
-  Comment("TsanRead");
-  LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true);
-  MoveRegister(CallingConventions::kArg1Reg, addr);
-  switch (size) {
-    case 1:
-      rt.Call(kTsanRead1RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 2:
-      rt.Call(kTsanRead2RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 4:
-      rt.Call(kTsanRead4RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 8:
-      rt.Call(kTsanRead8RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 16:
-      rt.Call(kTsanRead16RuntimeEntry, /*argument_count=*/1);
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
-void Assembler::TsanWrite(Register addr, intptr_t size) {
-  Comment("TsanWrite");
-  LeafRuntimeScope rt(this, /*frame_size=*/0, /*preserve_registers=*/true);
-  MoveRegister(CallingConventions::kArg1Reg, addr);
-  switch (size) {
-    case 1:
-      rt.Call(kTsanWrite1RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 2:
-      rt.Call(kTsanWrite2RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 4:
-      rt.Call(kTsanWrite4RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 8:
-      rt.Call(kTsanWrite8RuntimeEntry, /*argument_count=*/1);
-      break;
-    case 16:
-      rt.Call(kTsanWrite16RuntimeEntry, /*argument_count=*/1);
-      break;
-    default:
-      UNREACHABLE();
-  }
-}
-
 void Assembler::TsanFuncEntry(bool preserve_registers) {
   Comment("TsanFuncEntry");
   LeafRuntimeScope rt(this, /*frame_size=*/0, preserve_registers);

runtime/vm/compiler/assembler/assembler_x64.h

@@ -1163,8 +1163,6 @@ class Assembler : public AssemblerBase {
 
   void TsanLoadAcquire(Register dst, Address addr, OperandSize size);
   void TsanStoreRelease(Register src, Address addr, OperandSize size);
-  void TsanRead(Register addr, intptr_t size);
-  void TsanWrite(Register addr, intptr_t size);
   void TsanFuncEntry(bool preserve_registers = true);
   void TsanFuncExit(bool preserve_registers = true);
 

runtime/vm/compiler/backend/il.cc

@@ -4684,6 +4684,30 @@ void LoadFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(OffsetInBytes() != 0 || slot().has_untagged_instance());
   auto const rep = slot().representation();
 
+  if (!compiler->is_optimizing() && FLAG_target_thread_sanitizer &&
+      !slot().is_no_sanitize_thread() &&
+      memory_order() == compiler::Assembler::kRelaxedNonAtomic) {
+    EmitTsanCallUnopt(compiler, this, [&]() -> const RuntimeEntry& {
+      intptr_t tag = slot().has_untagged_instance() ? 0 : kHeapObjectTag;
+      __ AddImmediate(CallingConventions::ArgumentRegisters[0], instance_reg,
+                      slot().offset_in_bytes() - tag);
+      switch (RepresentationUtils::ValueSize(rep)) {
+        case 1:
+          return kTsanRead1RuntimeEntry;
+        case 2:
+          return kTsanRead2RuntimeEntry;
+        case 4:
+          return kTsanRead4RuntimeEntry;
+        case 8:
+          return kTsanRead8RuntimeEntry;
+        case 16:
+          return kTsanRead16RuntimeEntry;
+        default:
+          UNREACHABLE();
+      }
+    });
+  }
+
   if (calls_initializer()) {
     __ LoadFromSlot(locs()->out(0).reg(), instance_reg, slot(), memory_order_);
     EmitNativeCodeForInitializerCall(compiler);
@@ -7297,11 +7321,11 @@ static LocationSummary* MakeTsanLocationSummary(Zone* zone,
   return result;
 }
 
-static void EmitTsanNativeCode(
-    FlowGraphCompiler* compiler,
-    LocationSummary* locs,
-    std::function<const RuntimeEntry&()> move_parameters) {
-  const Register saved_sp = locs->temp(0).reg();
+static void EmitTsanCall(FlowGraphCompiler* compiler,
+                         Instruction* instr,
+                         RegisterSet spill_set,
+                         Register saved_sp,
+                         std::function<const RuntimeEntry&()> move_parameters) {
   ASSERT(IsCalleeSavedRegister(saved_sp));
   ASSERT(IsCalleeSavedRegister(THR));
   ASSERT(IsCalleeSavedRegister(PP));
@@ -7316,6 +7340,7 @@ static void EmitTsanNativeCode(
   ASSERT(IsCalleeSavedRegister(DISPATCH_TABLE_REG));
 #endif
 
+  __ PushRegisters(spill_set);
   __ MoveRegister(saved_sp, SPREG);
 #if defined(TARGET_ARCH_ARM64)
   __ AndImmediate(CSP, SP, ~(OS::ActivationFrameAlignment() - 1));
@@ -7327,13 +7352,40 @@ static void EmitTsanNativeCode(
   __ Store(TMP,
            compiler::Address(THR, compiler::target::Thread::vm_tag_offset()));
   __ CallCFunction(TMP);
+  compiler->AddCurrentDescriptor(UntaggedPcDescriptors::kOther, DeoptId::kNone,
+                                 instr->source());
   __ LoadImmediate(TMP, VMTag::kDartTagId);
   __ Store(TMP,
            compiler::Address(THR, compiler::target::Thread::vm_tag_offset()));
   __ MoveRegister(SPREG, saved_sp);
 #if defined(TARGET_ARCH_ARM64)
   __ SetupCSPFromThread(THR);
 #endif
+  __ PopRegisters(spill_set);
+}
+
+static void EmitTsanCall(FlowGraphCompiler* compiler,
+                         Instruction* instr,
+                         std::function<const RuntimeEntry&()> move_parameters) {
+  EmitTsanCall(compiler, instr, RegisterSet(), instr->locs()->temp(0).reg(),
+               move_parameters);
+}
+
+void EmitTsanCallUnopt(FlowGraphCompiler* compiler,
+                       Instruction* instr,
+                       std::function<const RuntimeEntry&()> move_parameters) {
+  intptr_t cpu_reg_mask = 0;
+  intptr_t fpu_reg_mask = 0;
+  LocationSummary* locs = instr->locs();
+  for (intptr_t i = 0, n = locs->input_count(); i < n; i++) {
+    if (locs->in(i).IsRegister()) {
+      cpu_reg_mask |= 1 << locs->in(i).reg();
+    } else if (locs->in(i).IsFpuRegister()) {
+      fpu_reg_mask |= 1 << locs->in(i).fpu_reg();
+    }
+  }
+  EmitTsanCall(compiler, instr, RegisterSet(cpu_reg_mask, fpu_reg_mask),
+               CALLEE_SAVED_TEMP, move_parameters);
 }
 
 LocationSummary* TsanFuncEntryExitInstr::MakeLocationSummary(Zone* zone,
@@ -7344,7 +7396,7 @@ LocationSummary* TsanFuncEntryExitInstr::MakeLocationSummary(Zone* zone,
 void TsanFuncEntryExitInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   if (!compiler->flow_graph().graph_entry()->NeedsFrame()) return;
 
-  EmitTsanNativeCode(compiler, locs(), [&]() -> const RuntimeEntry& {
+  EmitTsanCall(compiler, this, [&]() -> const RuntimeEntry& {
     if (kind_ == kEntry) {
       __ Load(
           CallingConventions::ArgumentRegisters[0],
@@ -7364,7 +7416,7 @@ LocationSummary* TsanReadWriteInstr::MakeLocationSummary(Zone* zone,
 }
 
 void TsanReadWriteInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  EmitTsanNativeCode(compiler, locs(), [&]() -> const RuntimeEntry& {
+  EmitTsanCall(compiler, this, [&]() -> const RuntimeEntry& {
     const Register instance_reg = locs()->in(0).reg();
     intptr_t tag = slot().has_untagged_instance() ? 0 : kHeapObjectTag;
     __ AddImmediate(CallingConventions::ArgumentRegisters[0], instance_reg,
@@ -7413,7 +7465,7 @@ LocationSummary* TsanReadWriteIndexedInstr::MakeLocationSummary(
 }
 
 void TsanReadWriteIndexedInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
-  EmitTsanNativeCode(compiler, locs(), [&]() -> const RuntimeEntry& {
+  EmitTsanCall(compiler, this, [&]() -> const RuntimeEntry& {
     const Register array_reg = locs()->in(kArrayPos).reg();
     Register index_reg = locs()->in(kIndexPos).reg();
 
@@ -8022,6 +8074,30 @@ void StoreFieldInstr::EmitNativeCode(FlowGraphCompiler* compiler) {
   ASSERT(OffsetInBytes() != 0 || slot().has_untagged_instance());
   const Representation rep = slot().representation();
 
+  if (!compiler->is_optimizing() && FLAG_target_thread_sanitizer &&
+      !slot().is_no_sanitize_thread() &&
+      memory_order() == compiler::Assembler::kRelaxedNonAtomic) {
+    EmitTsanCallUnopt(compiler, this, [&]() -> const RuntimeEntry& {
+      intptr_t tag = slot().has_untagged_instance() ? 0 : kHeapObjectTag;
+      __ AddImmediate(CallingConventions::ArgumentRegisters[0], instance_reg,
+                      slot().offset_in_bytes() - tag);
+      switch (RepresentationUtils::ValueSize(rep)) {
+        case 1:
+          return kTsanWrite1RuntimeEntry;
+        case 2:
+          return kTsanWrite2RuntimeEntry;
+        case 4:
+          return kTsanWrite4RuntimeEntry;
+        case 8:
+          return kTsanWrite8RuntimeEntry;
+        case 16:
+          return kTsanWrite16RuntimeEntry;
+        default:
+          UNREACHABLE();
+      }
+    });
+  }
+
 #if defined(TARGET_ARCH_ARM64) || defined(TARGET_ARCH_RISCV32) ||              \
     defined(TARGET_ARCH_RISCV64)
   if (locs()->in(kValuePos).IsConstant() &&

runtime/vm/compiler/backend/il.h

@@ -11799,6 +11799,10 @@ inline bool Value::CanBe(const Object& value) {
 #undef DECLARE_CUSTOM_SERIALIZATION
 #undef DECLARE_EMPTY_SERIALIZATION
 
+void EmitTsanCallUnopt(FlowGraphCompiler* compiler,
+                       Instruction* instr,
+                       std::function<const RuntimeEntry&()> move_parameters);
+
 }  // namespace dart
 
 #endif  // RUNTIME_VM_COMPILER_BACKEND_IL_H_