From cb5bf58f3d04124667ceb33153fbf54e8c43d4cb Mon Sep 17 00:00:00 2001
From: Timur Iskhodzhanov <timurrrr@google.com>
Date: Tue, 22 Jul 2014 14:02:53 +0000
Subject: [PATCH] [ASan/Win] Add SEH handling to the DLL thunk as well

llvm-svn: 213656
---
 compiler-rt/lib/asan/asan_dll_thunk.cc             |  4 ++
 compiler-rt/test/asan/TestCases/Windows/dll_seh.cc | 54 ++++++++++++++++++++++
 2 files changed, 58 insertions(+)
 create mode 100644 compiler-rt/test/asan/TestCases/Windows/dll_seh.cc

diff --git a/compiler-rt/lib/asan/asan_dll_thunk.cc b/compiler-rt/lib/asan/asan_dll_thunk.cc
index a3fbb27..b281fb3 100644
--- a/compiler-rt/lib/asan/asan_dll_thunk.cc
+++ b/compiler-rt/lib/asan/asan_dll_thunk.cc
@@ -251,6 +251,9 @@ INTERFACE_FUNCTION(__asan_unpoison_stack_memory)
 INTERFACE_FUNCTION(__asan_poison_memory_region)
 INTERFACE_FUNCTION(__asan_unpoison_memory_region)
 
+INTERFACE_FUNCTION(__asan_address_is_poisoned)
+INTERFACE_FUNCTION(__asan_region_is_poisoned)
+
 INTERFACE_FUNCTION(__asan_get_current_fake_stack)
 INTERFACE_FUNCTION(__asan_addr_is_in_fake_stack)
 
@@ -307,6 +310,7 @@ WRAP_W_W(_expand_dbg)
 
 INTERCEPT_LIBRARY_FUNCTION(atoi);
 INTERCEPT_LIBRARY_FUNCTION(atol);
+INTERCEPT_LIBRARY_FUNCTION(_except_handler3);
 INTERCEPT_LIBRARY_FUNCTION(frexp);
 INTERCEPT_LIBRARY_FUNCTION(longjmp);
 INTERCEPT_LIBRARY_FUNCTION(memchr);
diff --git a/compiler-rt/test/asan/TestCases/Windows/dll_seh.cc b/compiler-rt/test/asan/TestCases/Windows/dll_seh.cc
new file mode 100644
index 0000000..b706eee
--- /dev/null
+++ b/compiler-rt/test/asan/TestCases/Windows/dll_seh.cc
@@ -0,0 +1,54 @@
+// 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: %clang_cl_asan -O0 %p/dll_host.cc -Fe%t
+// RUN: cl -LD -Zi -FS -GS- -c %s -Fo%t.obj
+// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll %t.obj
+// RUN: %run %t %t.dll
+
+#include <windows.h>
+#include <assert.h>
+#include <stdio.h>
+
+// 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();
+
+#if !defined(__clang__)
+__declspec(noinline)
+void Throw() {
+  int local, zero = 0;
+  fprintf(stderr, "Throw:  %p\n", &local);
+  local = 5 / zero;
+}
+
+__declspec(noinline)
+void ThrowAndCatch() {
+  int local;
+  __try {
+    Throw();
+  } __except(EXCEPTION_EXECUTE_HANDLER) {
+    fprintf(stderr, "__except:  %p\n", &local);
+  }
+}
+#else
+
+extern "C" __declspec(dllexport)
+int test_function() {
+  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();
+  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));
+  return 0;
+}
+#endif
-- 
2.7.4