4 files changed, 2 insertions, 9 deletions
diff --git a/include/sanitizer/msan_interface.h b/include/sanitizer/msan_interface.h
index 9aa44a010..3d9bdc33d 100644
--- a/include/sanitizer/msan_interface.h
+++ b/include/sanitizer/msan_interface.h
@@ -95,8 +95,7 @@ extern "C" {
      a string containing Msan runtime options. See msan_flags.h for details. */
   const char* __msan_default_options();
 
-  /* Sets the callback to be called right before death on error.
-     Passing 0 will unset the callback. */
+  /* Deprecated. Call __sanitizer_set_death_callback instead. */
   void __msan_set_death_callback(void (*callback)(void));
 
 #ifdef __cplusplus
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc
index 1d2767d8d..0ba7f32bb 100644
--- a/lib/msan/msan.cc
+++ b/lib/msan/msan.cc
@@ -90,8 +90,6 @@ bool msan_init_is_running;
 
 int msan_report_count = 0;
 
-void (*death_callback)(void);
-
 // Array of stack origins.
 // FIXME: make it resizable.
 static const uptr kNumStackOriginDescrs = 1024 * 1024;
@@ -623,7 +621,7 @@ void __sanitizer_unaligned_store64(uu64 *p, u64 x) {
 }
 
 void __msan_set_death_callback(void (*callback)(void)) {
-  death_callback = callback;
+  SetUserDieCallback(callback);
 }
 
 #if !SANITIZER_SUPPORTS_WEAK_HOOKS
diff --git a/lib/msan/msan.h b/lib/msan/msan.h
index cd8bc19f5..3a6e1a709 100644
--- a/lib/msan/msan.h
+++ b/lib/msan/msan.h
@@ -224,8 +224,6 @@ class ScopedThreadLocalStateBackup {
   u64 va_arg_overflow_size_tls;
 };
 
-extern void (*death_callback)(void);
-
 void MsanTSDInit(void (*destructor)(void *tsd));
 void *MsanTSDGet();
 void MsanTSDSet(void *tsd);
diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc
index 9e971994d..f4b48b7ab 100644
--- a/lib/msan/msan_linux.cc
+++ b/lib/msan/msan_linux.cc
@@ -154,8 +154,6 @@ bool InitShadow(bool init_origins) {
 void MsanDie() {
   if (common_flags()->coverage)
     __sanitizer_cov_dump();
-  if (death_callback)
-    death_callback();
 }
 
 static void MsanAtExit(void) {