diff options
| author | Martin Storsjo <martin@martin.st> | 2018-09-26 19:49:35 +0000 |
|---|---|---|
| committer | Martin Storsjo <martin@martin.st> | 2018-09-26 19:49:35 +0000 |
| commit | a89731ca718f66903b1ce9944f252cc636df810d (patch) | |
| tree | d4b23a07798564a87d48904f39056c78e94b345a | |
| parent | 5dffc95b26b6dc056f1ea09ba39aa3f383df8f24 (diff) | |
| download | bcm5719-llvm-a89731ca718f66903b1ce9944f252cc636df810d.tar.gz bcm5719-llvm-a89731ca718f66903b1ce9944f252cc636df810d.zip | |
[asan] [windows] Don't use CheckFailed in dynamic runtime thunk mode
Since SVN r342651, CheckFailed isn't exported from asan-dynamic. See
comments in https://reviews.llvm.org/D52279#1246222 for a longer
discussion on this issue.
Differential Revision: https://reviews.llvm.org/D52566
llvm-svn: 343136
| -rw-r--r-- | compiler-rt/lib/asan/asan_globals_win.cc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/compiler-rt/lib/asan/asan_globals_win.cc b/compiler-rt/lib/asan/asan_globals_win.cc index 29ab5ebf16d..0e75992bfc8 100644 --- a/compiler-rt/lib/asan/asan_globals_win.cc +++ b/compiler-rt/lib/asan/asan_globals_win.cc @@ -29,7 +29,7 @@ static void call_on_globals(void (*hook)(__asan_global *, uptr)) { __asan_global *end = &__asan_globals_end; uptr bytediff = (uptr)end - (uptr)start; if (bytediff % sizeof(__asan_global) != 0) { -#ifdef SANITIZER_DLL_THUNK +#if defined(SANITIZER_DLL_THUNK) || defined(SANITIZER_DYNAMIC_RUNTIME_THUNK) __debugbreak(); #else CHECK("corrupt asan global array"); |
