[Windows] Simplify more tests now that Clang supports EH
Remove TestCases/Windows/throw_catch.cc, since it is redundant with the portable test TestCases/throw_catch.cc. llvm-svn: 261342
This commit is contained in:
parent
06977c799c
commit
12813b0def
|
|
@ -1,17 +1,10 @@
|
|||
// 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
|
||||
//
|
||||
// Check both -GS and -GS- builds:
|
||||
// RUN: cl -LD -c %s -Fo%t.obj
|
||||
// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll %t.obj
|
||||
// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
|
||||
// RUN: %run %t %t.dll
|
||||
//
|
||||
// RUN: cl -LD -GS- -c %s -Fo%t.obj
|
||||
// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll %t.obj
|
||||
// RUN: %clang_cl_asan -LD -O0 %s -Fe%t.dll
|
||||
// RUN: %run %t %t.dll
|
||||
|
||||
#include <windows.h>
|
||||
|
|
@ -24,7 +17,6 @@ extern "C" bool __asan_address_is_poisoned(void *p);
|
|||
|
||||
void ThrowAndCatch();
|
||||
|
||||
#if !defined(__clang__)
|
||||
__declspec(noinline)
|
||||
void Throw() {
|
||||
int local, zero = 0;
|
||||
|
|
@ -41,7 +33,6 @@ void ThrowAndCatch() {
|
|||
fprintf(stderr, "__except: %p\n", &local);
|
||||
}
|
||||
}
|
||||
#else
|
||||
|
||||
extern "C" __declspec(dllexport)
|
||||
int test_function() {
|
||||
|
|
@ -57,4 +48,3 @@ int test_function() {
|
|||
assert(!__asan_address_is_poisoned(x + 32));
|
||||
return 0;
|
||||
}
|
||||
#endif
|
||||
|
|
|
|||
|
|
@ -1,73 +0,0 @@
|
|||
// 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 -c %s -Fo%t.obj
|
||||
// RUN: %clangxx_asan -o %t.exe %s %t.obj
|
||||
// RUN: %run %t.exe
|
||||
|
||||
#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();
|
||||
void TestThrowInline();
|
||||
|
||||
#if !defined(__clang__)
|
||||
__declspec(noinline)
|
||||
void Throw() {
|
||||
int local;
|
||||
fprintf(stderr, "Throw: %p\n", &local);
|
||||
throw 1;
|
||||
}
|
||||
|
||||
__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 {
|
||||
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
|
||||
// https://code.google.com/p/address-sanitizer/issues/detail?id=258
|
||||
assert(!__asan_address_is_poisoned(x + 32));
|
||||
}
|
||||
|
||||
#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));
|
||||
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));
|
||||
}
|
||||
|
||||
int main(int argc, char **argv) {
|
||||
TestThrowInline();
|
||||
TestThrow();
|
||||
}
|
||||
#endif
|
||||
Loading…
Reference in New Issue