[compiler-rt] r213649 - [ASan/Win] Add handling of C++ exceptions to the RTL

[Timur Iskhodzhanov]

Author: timurrrr
Date: Tue Jul 22 07:37:51 2014
New Revision: 213649

URL: http://llvm.org/viewvc/llvm-project?rev=213649&view=rev
Log:
[ASan/Win] Add handling of C++ exceptions to the RTL

Also add a longjmp() test

Added:
    compiler-rt/trunk/test/asan/TestCases/Windows/longjmp.cc
      - copied, changed from r213647, compiler-rt/trunk/test/asan/TestCases/longjmp.cc
    compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc
      - copied, changed from r213647, compiler-rt/trunk/test/asan/TestCases/throw_catch.cc
Modified:
    compiler-rt/trunk/lib/asan/asan_interceptors.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=213649&r1=213648&r2=213649&view=diff
==============================================================================
--- compiler-rt/trunk/lib/asan/asan_interceptors.cc (original)
+++ compiler-rt/trunk/lib/asan/asan_interceptors.cc Tue Jul 22 07:37:51 2014
@@ -295,6 +295,14 @@ INTERCEPTOR(void, __cxa_throw, void *a,
 }
 #endif
 
+#if SANITIZER_WINDOWS
+INTERCEPTOR_WINAPI(void, RaiseException, void *a, void *b, void *c, void *d) {
+  CHECK(REAL(RaiseException));
+  __asan_handle_no_return();
+  REAL(RaiseException)(a, b, c, d);
+}
+#endif
+
 #if ASAN_INTERCEPT_MLOCKX
 // intercept mlock and friends.
 // Since asan maps 16T of RAM, mlock is completely unfriendly to asan.
@@ -728,6 +736,7 @@ INTERCEPTOR_WINAPI(DWORD, CreateThread,
 namespace __asan {
 void InitializeWindowsInterceptors() {
   ASAN_INTERCEPT_FUNC(CreateThread);
+  ASAN_INTERCEPT_FUNC(RaiseException);
 }
 
 }  // namespace __asan

Copied: compiler-rt/trunk/test/asan/TestCases/Windows/longjmp.cc (from r213647, compiler-rt/trunk/test/asan/TestCases/longjmp.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/longjmp.cc?p2=compiler-rt/trunk/test/asan/TestCases/Windows/longjmp.cc&p1=compiler-rt/trunk/test/asan/TestCases/longjmp.cc&r1=213647&r2=213649&rev=213649&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/longjmp.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/longjmp.cc Tue Jul 22 07:37:51 2014
@@ -1,5 +1,8 @@
 // RUN: %clangxx_asan -O %s -o %t && %run %t
 
+// FIXME: merge this with the common longjmp test when we can run common
+// tests on Windows.
+
 #include <assert.h>
 #include <setjmp.h>
 #include <stdio.h>

Copied: compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc (from r213647, compiler-rt/trunk/test/asan/TestCases/throw_catch.cc)
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc?p2=compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc&p1=compiler-rt/trunk/test/asan/TestCases/throw_catch.cc&r1=213647&r2=213649&rev=213649&view=diff
==============================================================================
--- compiler-rt/trunk/test/asan/TestCases/throw_catch.cc (original)
+++ compiler-rt/trunk/test/asan/TestCases/Windows/throw_catch.cc Tue Jul 22 07:37:51 2014
@@ -1,20 +1,31 @@
-// RUN: %clangxx_asan -O %s -o %t && %run %t
-
-// Clang doesn't support exceptions on Windows yet.
-// XFAIL: win32
+// 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,
+// 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: %clangxx_asan -o %t.exe %s %t.obj
+// RUN: %run %t.exe
 
 #include <assert.h>
 #include <stdio.h>
-#include <sanitizer/asan_interface.h>
 
-__attribute__((noinline))
+// Should just "#include <sanitizer/asan_interface.h>" when C++ exceptions are
+// supported and we don't need to use CL.
+extern "C" bool __asan_address_is_poisoned(void *p);
+
+void ThrowAndCatch();
+void TestThrowInline();
+
+#if !defined(__clang__)
+__declspec(noinline)
 void Throw() {
   int local;
   fprintf(stderr, "Throw:  %p\n", &local);
   throw 1;
 }
 
-__attribute__((noinline))
+__declspec(noinline)
 void ThrowAndCatch() {
   int local;
   try {
@@ -24,12 +35,15 @@ void ThrowAndCatch() {
   }
 }
 
-void TestThrow() {
+void TestThrowInline() {
   char x[32];
   fprintf(stderr, "Before: %p poisoned: %d\n", &x,
           __asan_address_is_poisoned(x + 32));
-  assert(__asan_address_is_poisoned(x + 32));
-  ThrowAndCatch();
+  try {
+    Throw();
+  } catch(...) {
+    fprintf(stderr, "Catch\n");
+  }
   fprintf(stderr, "After:  %p poisoned: %d\n",  &x,
           __asan_address_is_poisoned(x + 32));
   // FIXME: Invert this assertion once we fix
@@ -37,16 +51,14 @@ void TestThrow() {
   assert(!__asan_address_is_poisoned(x + 32));
 }
 
-void TestThrowInline() {
+#else
+
+void TestThrow() {
   char x[32];
   fprintf(stderr, "Before: %p poisoned: %d\n", &x,
           __asan_address_is_poisoned(x + 32));
   assert(__asan_address_is_poisoned(x + 32));
-  try {
-    Throw();
-  } catch(...) {
-    fprintf(stderr, "Catch\n");
-  }
+  ThrowAndCatch();
   fprintf(stderr, "After:  %p poisoned: %d\n",  &x,
           __asan_address_is_poisoned(x + 32));
   // FIXME: Invert this assertion once we fix
@@ -58,3 +70,4 @@ int main(int argc, char **argv) {
   TestThrowInline();
   TestThrow();
 }
+#endif