diff options
author | Kostya Serebryany <kcc@google.com> | 2013-10-17 13:18:21 +0000 |
---|---|---|
committer | Kostya Serebryany <kcc@google.com> | 2013-10-17 13:18:21 +0000 |
commit | 13521a267f509a06e92baa154947b9d2cde0eed8 (patch) | |
tree | c7a04414ecb1ca3d8e960e167c1a3aded9dfdda7 /lib | |
parent | ab8bf09f11d76af6bf9bf6b573f36cb29aa3e557 (diff) | |
download | compiler-rt-13521a267f509a06e92baa154947b9d2cde0eed8.tar.gz compiler-rt-13521a267f509a06e92baa154947b9d2cde0eed8.tar.bz2 compiler-rt-13521a267f509a06e92baa154947b9d2cde0eed8.tar.xz |
[asan] fix a failure with ASAN_OPTIONS=verbosity=1:use_sigaltstack=1
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@192892 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib')
-rw-r--r-- | lib/asan/asan_rtl.cc | 2 | ||||
-rw-r--r-- | lib/asan/lit_tests/TestCases/deep_call_stack.cc | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/lib/asan/asan_rtl.cc b/lib/asan/asan_rtl.cc index 1c207f16..ce7278f0 100644 --- a/lib/asan/asan_rtl.cc +++ b/lib/asan/asan_rtl.cc @@ -533,9 +533,9 @@ void __asan_init() { Die(); } + AsanTSDInit(PlatformTSDDtor); InstallSignalHandlers(); - AsanTSDInit(PlatformTSDDtor); // Allocator should be initialized before starting external symbolizer, as // fork() on Mac locks the allocator. InitializeAllocator(); diff --git a/lib/asan/lit_tests/TestCases/deep_call_stack.cc b/lib/asan/lit_tests/TestCases/deep_call_stack.cc index d231bb57..e24704b9 100644 --- a/lib/asan/lit_tests/TestCases/deep_call_stack.cc +++ b/lib/asan/lit_tests/TestCases/deep_call_stack.cc @@ -2,6 +2,8 @@ // export ASAN_OPTIONS=detect_stack_use_after_return=1 // RUN: %clangxx_asan -O2 %s -o %t && \ // RUN: %t 2>&1 | FileCheck %s +// Also check that use_sigaltstack+verbosity doesn't crash. +// RUN: ASAN_OPTIONS=verbosity=1:use_sigaltstack=1 %t | FileCheck %s #include <stdio.h> __attribute__((noinline)) |