diff options
Diffstat (limited to 'compiler-rt/lib/tsan')
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc | 12 | ||||
| -rw-r--r-- | compiler-rt/lib/tsan/rtl/tsan_rtl.h | 2 |
2 files changed, 9 insertions, 5 deletions
diff --git a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc index 6d6290adfdb..e60b821ec14 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc +++ b/compiler-rt/lib/tsan/rtl/tsan_platform_linux.cc @@ -39,6 +39,14 @@ extern "C" int arch_prctl(int code, __sanitizer::uptr *addr); +namespace __sanitizer { + +void Die() { + _exit(1); +} + +} // namespace __sanitizer + namespace __tsan { static uptr g_tls_size; @@ -56,10 +64,6 @@ ScopedInRtl::~ScopedInRtl() { CHECK_EQ(in_rtl_, thr_->in_rtl); } -void Die() { - _exit(1); -} - uptr GetShadowMemoryConsumption() { return 0; } diff --git a/compiler-rt/lib/tsan/rtl/tsan_rtl.h b/compiler-rt/lib/tsan/rtl/tsan_rtl.h index fc585243477..f89f2420b57 100644 --- a/compiler-rt/lib/tsan/rtl/tsan_rtl.h +++ b/compiler-rt/lib/tsan/rtl/tsan_rtl.h @@ -26,6 +26,7 @@ #ifndef TSAN_RTL_H #define TSAN_RTL_H +#include "sanitizer_common/sanitizer_common.h" #include "tsan_clock.h" #include "tsan_defs.h" #include "tsan_flags.h" @@ -390,7 +391,6 @@ void ALWAYS_INLINE INLINE StatInc(ThreadState *thr, StatType typ, u64 n = 1) { void InitializeShadowMemory(); void InitializeInterceptors(); void InitializeDynamicAnnotations(); -void Die() NORETURN; void ReportRace(ThreadState *thr); bool OutputReport(const ScopedReport &srep, |
