[compiler-rt] r213654 - [ASan/Win] Handle SEH exceptions (best-effort, similar to longjmp)

[Timur Iskhodzhanov]

Author: timurrrr
Date: Tue Jul 22 08:44:18 2014
New Revision: 213654

URL: http://llvm.org/viewvc/llvm-project?rev=213654&view=rev
Log:
[ASan/Win] Handle SEH exceptions (best-effort, similar to longjmp)

Added:
    compiler-rt/trunk/test/asan/TestCases/Windows/seh.cc
      - copied, changed from r213653, compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc
Modified:
    compiler-rt/trunk/lib/asan/asan_interceptors.cc
    compiler-rt/trunk/lib/asan/asan_report.cc

Modified: compiler-rt/trunk/lib/asan/asan_interceptors.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_interceptors.cc?rev=213654&r1=213653&r2=213654&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Tue Jul 22 08:44:18 2014
@@ -301,6 +301,12 @@ INTERCEPTOR_WINAPI(void, RaiseException,
   __asan_handle_no_return();
   REAL(RaiseException)(a, b, c, d);
 }
+
+INTERCEPTOR(int, _except_handler3, void *a, void *b, void *c, void *d) {
+  CHECK(REAL(_except_handler3));
+  __asan_handle_no_return();
+  return REAL(_except_handler3)(a, b, c, d);
+}
 #endif
 
 #if ASAN_INTERCEPT_MLOCKX
@@ -737,6 +743,7 @@ namespace __asan {
 void InitializeWindowsInterceptors() {
   ASAN_INTERCEPT_FUNC(CreateThread);
   ASAN_INTERCEPT_FUNC(RaiseException);
+  ASAN_INTERCEPT_FUNC(_except_handler3);
 }
 
 }  // namespace __asan

Modified: compiler-rt/trunk/lib/asan/asan_report.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/asan/asan_report.cc?rev=213654&r1=213653&r2=213654&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_report.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_report.cc Tue Jul 22 08:44:18 2014
@@ -427,8 +427,12 @@ bool DescribeAddressIfStack(uptr addr, u
                                   prev_var_end, next_var_beg);
   }
   Printf("HINT: this may be a false positive if your program uses "
-             "some custom stack unwind mechanism or swapcontext\n"
-             "      (longjmp and C++ exceptions *are* supported)\n");
+         "some custom stack unwind mechanism or swapcontext\n");
+  if (SANITIZER_WINDOWS)
+    Printf("      (longjmp, SEH and C++ exceptions *are* supported)\n");
+  else
+    Printf("      (longjmp and C++ exceptions *are* supported)\n");
+
   DescribeThread(t);
   return true;
 }

Copied: compiler-rt/trunk/test/asan/TestCases/Windows/seh.cc (from r213653, compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/seh.cc?p2=compiler-rt/trunk/test/asan/TestCases/Windows/seh.cc&p1=compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc&r1=213653&r2=213654&rev=213654&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/seh.cc Tue Jul 22 08:44:18 2014
@@ -1,12 +1,13 @@
-// Clang doesn't support exceptions on Windows yet, so for the time being we
-// build this program in two parts: the code with exceptions is built with CL,
+// Clang doesn't support SEH on Windows yet, so for the time being we
+// build this program in two parts: the code with SEH is built with CL,
 // the rest is built with Clang.  This represents the typical scenario when we
 // build a large project using "clang-cl -fallback -fsanitize=address".
 //
-// RUN: cl -Zi -FS -c %s -Fo%t.obj
+// RUN: cl -Zi -FS -GS- -c %s -Fo%t.obj
 // RUN: %clangxx_asan -o %t.exe %s %t.obj
 // RUN: %run %t.exe
 
+#include <windows.h>
 #include <assert.h>
 #include <stdio.h>
 
@@ -15,45 +16,27 @@
 extern "C" bool __asan_address_is_poisoned(void *p);
 
 void ThrowAndCatch();
-void TestThrowInline();
 
 #if !defined(__clang__)
 __declspec(noinline)
 void Throw() {
-  int local;
+  int local, zero = 0;
   fprintf(stderr, "Throw:  %p\n", &local);
-  throw 1;
+  local = 5 / zero;
 }
 
 __declspec(noinline)
 void ThrowAndCatch() {
   int local;
-  try {
-    Throw();
-  } catch(...) {
-    fprintf(stderr, "Catch:  %p\n", &local);
-  }
-}
-
-void TestThrowInline() {
-  char x[32];
-  fprintf(stderr, "Before: %p poisoned: %d\n", &x,
-          __asan_address_is_poisoned(x + 32));
-  try {
+  __try {
     Throw();
-  } catch(...) {
-    fprintf(stderr, "Catch\n");
+  } __except(EXCEPTION_EXECUTE_HANDLER) {
+    fprintf(stderr, "__except:  %p\n", &local);
   }
-  fprintf(stderr, "After:  %p poisoned: %d\n",  &x,
-          __asan_address_is_poisoned(x + 32));
-  // FIXME: Invert this assertion once we fix
-  // https://code.google.com/p/address-sanitizer/issues/detail?id=258
-  assert(!__asan_address_is_poisoned(x + 32));
 }
-
 #else
 
-void TestThrow() {
+int main() {
   char x[32];
   fprintf(stderr, "Before: %p poisoned: %d\n", &x,
           __asan_address_is_poisoned(x + 32));
@@ -65,9 +48,4 @@ void TestThrow() {
   // https://code.google.com/p/address-sanitizer/issues/detail?id=258
   assert(!__asan_address_is_poisoned(x + 32));
 }
-
-int main(int argc, char **argv) {
-  TestThrowInline();
-  TestThrow();
-}
 #endif