3 files changed, 7 insertions, 17 deletions
diff --git a/lib/tsan/rtl/tsan_interceptors.cc b/lib/tsan/rtl/tsan_interceptors.cc
index 06025a4e5..1bed55241 100644
--- a/lib/tsan/rtl/tsan_interceptors.cc
+++ b/lib/tsan/rtl/tsan_interceptors.cc
@@ -2449,7 +2449,7 @@ static void finalize(void *arg) {
   // Make sure the output is not lost.
   FlushStreams();
   if (status)
-    REAL(_exit)(status);
+    Die();
 }
 
 static void unreachable() {
diff --git a/lib/tsan/rtl/tsan_rtl_report.cc b/lib/tsan/rtl/tsan_rtl_report.cc
index 12e7ad68c..e39585a4e 100644
--- a/lib/tsan/rtl/tsan_rtl_report.cc
+++ b/lib/tsan/rtl/tsan_rtl_report.cc
@@ -514,7 +514,7 @@ bool OutputReport(ThreadState *thr, const ScopedReport &srep) {
   PrintReport(rep);
   ctx->nreported++;
   if (flags()->halt_on_error)
-    internal__exit(common_flags()->exitcode);
+    Die();
   return true;
 }
 
diff --git a/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc b/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc
index 91e82d310..a64f4771f 100644
--- a/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc
+++ b/test/sanitizer_common/TestCases/Linux/sanitizer_set_death_callback_test.cc
@@ -1,10 +1,7 @@
 // RUN: %clangxx -O2 %s -o %t && not %run %t 2>&1 | FileCheck %s
-// Check __sanitizer_set_death_callback. Not all sanitizers implement it yet.
-// XFAIL: tsan
 
 #include <sanitizer/common_interface_defs.h>
 #include <stdio.h>
-#include <pthread.h>
 
 volatile char *zero = 0;
 
@@ -13,14 +10,9 @@ void Death() {
 }
 // CHECK: DEATH CALLBACK EXECUTED
 
-int global[10];
+char global;
 volatile char *sink;
 
-void *Thread(void *x) {
-  global[0]++;
-  return x;
-}
-
 __attribute__((noinline))
 void MaybeInit(int *uninitialized) {
   if (zero)
@@ -37,12 +29,10 @@ int main(int argc, char **argv) {
   __sanitizer_set_death_callback(Death);
   MaybeInit(&uninitialized);
   if (uninitialized)  // trigger msan report.
-    global[0] = 77;
-  pthread_t t;
-  pthread_create(&t, 0, Thread, 0);
-  global[0]++;           // trigger tsan report.
-  pthread_join(t, 0);
-  global[argc + 10]++;   // trigger asan report.
+    global = 77;
+  sink = new char[100];
+  delete[] sink;
+  global = sink[0];  // use-after-free: trigger asan/tsan report.
   Leak();
   sink = 0;
 }