[PATCH] D52566: [asan] [windows] Don't use CheckFailed in dynamic runtime thunk mode

[Martin Storsjö via Phabricator via llvm-commits]

This revision was automatically updated to reflect the committed changes.
Closed by commit rL343136: [asan] [windows] Don't use CheckFailed in dynamic runtime thunk mode (authored by mstorsjo, committed by ).
Herald added a subscriber: delcypher.

Changed prior to commit:
  https://reviews.llvm.org/D52566?vs=167168&id=167175#toc

Repository:
  rL LLVM

https://reviews.llvm.org/D52566

Files:
  compiler-rt/trunk/lib/asan/asan_globals_win.cc


Index: compiler-rt/trunk/lib/asan/asan_globals_win.cc
===================================================================
--- compiler-rt/trunk/lib/asan/asan_globals_win.cc
+++ compiler-rt/trunk/lib/asan/asan_globals_win.cc
@@ -29,7 +29,7 @@
   __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");


-------------- next part --------------
A non-text attachment was scrubbed...
Name: D52566.167175.patch
Type: text/x-patch
Size: 554 bytes
Desc: not available
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20180926/7efc0473/attachment.bin>