diff options
| author | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:52:22 +0000 |
|---|---|---|
| committer | Dimitry Andric <dim@FreeBSD.org> | 2019-10-23 17:52:22 +0000 |
| commit | 3a1720af1d7f43edc5b214cde0be11bfb94d077e (patch) | |
| tree | 029e0ff2d5e3c0eaf2405fd8e669555fdf5e1297 /lib/msan/msan.h | |
| parent | 8f3cadc28cb2bb9e8f9d69eeaaea1f57f2f7b2ab (diff) | |
Notes
Diffstat (limited to 'lib/msan/msan.h')
| -rw-r--r-- | lib/msan/msan.h | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/msan/msan.h b/lib/msan/msan.h index ac5f67e6ab3d..12aeaa43519a 100644 --- a/lib/msan/msan.h +++ b/lib/msan/msan.h @@ -267,7 +267,7 @@ inline bool addr_is_type(uptr addr, MappingDesc::Type mapping_type) { #define MEM_IS_SHADOW(mem) addr_is_type((uptr)(mem), MappingDesc::SHADOW) #define MEM_IS_ORIGIN(mem) addr_is_type((uptr)(mem), MappingDesc::ORIGIN) -// These constants must be kept in sync with the ones in MemorySanitizer.cc. +// These constants must be kept in sync with the ones in MemorySanitizer.cpp. const int kMsanParamTlsSize = 800; const int kMsanRetvalTlsSize = 800; @@ -346,10 +346,11 @@ const int STACK_TRACE_TAG_POISON = StackTrace::TAG_CUSTOM + 1; #define GET_STORE_STACK_TRACE \ GET_STORE_STACK_TRACE_PC_BP(StackTrace::GetCurrentPc(), GET_CURRENT_FRAME()) -#define GET_FATAL_STACK_TRACE_PC_BP(pc, bp) \ - BufferedStackTrace stack; \ - if (msan_inited) \ - stack.Unwind(pc, bp, nullptr, common_flags()->fast_unwind_on_fatal) +#define GET_FATAL_STACK_TRACE_PC_BP(pc, bp) \ + BufferedStackTrace stack; \ + if (msan_inited) { \ + stack.Unwind(pc, bp, nullptr, common_flags()->fast_unwind_on_fatal); \ + } #define GET_FATAL_STACK_TRACE_HERE \ GET_FATAL_STACK_TRACE_PC_BP(StackTrace::GetCurrentPc(), GET_CURRENT_FRAME()) |