summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorAlexey Samsonov <vonosmas@gmail.com>2015-08-21 22:45:12 +0000
committerAlexey Samsonov <vonosmas@gmail.com>2015-08-21 22:45:12 +0000
commit8350e8cdd3af0f361b1791b70ec3e31f334a9dcc (patch)
tree3ff975c84a5bbbf1159edde94cadfacdafbefa48 /lib
parent23b3d26ca5e3f782373f73620d7872dc0fc1c0b2 (diff)
[MSan] Deprecate __msan_set_death_callback() in favor of __sanitizer_set_death_callback().
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@245754 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r--lib/msan/msan.cc4
-rw-r--r--lib/msan/msan.h2
-rw-r--r--lib/msan/msan_linux.cc2
3 files changed, 1 insertions, 7 deletions
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) {