diff options
| author | Alexey Samsonov <vonosmas@gmail.com> | 2015-08-22 05:15:55 +0000 |
|---|---|---|
| committer | Alexey Samsonov <vonosmas@gmail.com> | 2015-08-22 05:15:55 +0000 |
| commit | d0a992e536cbd34fbd9a66e0fcf6decebfab8ee6 (patch) | |
| tree | 23ba4f65996e8711bc2728a95710cfc6510b1dc6 /lib/msan | |
| parent | b1feacf61c6e529e610a7cc8254e6eef43fe96bf (diff) | |
Revert r245770 and r245777.
These changes break both autoconf Mac OS X buildbot (linker errors
due to wrong Makefiles) and CMake buildbot (safestack test failures).
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@245784 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'lib/msan')
| -rw-r--r-- | lib/msan/msan.cc | 1 | ||||
| -rw-r--r-- | lib/msan/msan.h | 1 | ||||
| -rw-r--r-- | lib/msan/msan_linux.cc | 5 |
3 files changed, 7 insertions, 0 deletions
diff --git a/lib/msan/msan.cc b/lib/msan/msan.cc index ce4b1a5dd..0ba7f32bb 100644 --- a/lib/msan/msan.cc +++ b/lib/msan/msan.cc @@ -375,6 +375,7 @@ void __msan_init() { msan_init_is_running = 1; SanitizerToolName = "MemorySanitizer"; + SetDieCallback(MsanDie); InitTlsSize(); CacheBinaryName(); diff --git a/lib/msan/msan.h b/lib/msan/msan.h index e4344e564..3a6e1a709 100644 --- a/lib/msan/msan.h +++ b/lib/msan/msan.h @@ -167,6 +167,7 @@ struct SymbolizerScope { ~SymbolizerScope() { ExitSymbolizer(); } }; +void MsanDie(); void PrintWarning(uptr pc, uptr bp); void PrintWarningWithOrigin(uptr pc, uptr bp, u32 origin); diff --git a/lib/msan/msan_linux.cc b/lib/msan/msan_linux.cc index 7f6cb75ff..f4b48b7ab 100644 --- a/lib/msan/msan_linux.cc +++ b/lib/msan/msan_linux.cc @@ -151,6 +151,11 @@ bool InitShadow(bool init_origins) { return true; } +void MsanDie() { + if (common_flags()->coverage) + __sanitizer_cov_dump(); +} + static void MsanAtExit(void) { if (flags()->print_stats && (flags()->atexit || msan_report_count > 0)) ReportStats(); |