From aa42f292210faddaeecfafd65a1f9a1a3305d74c Mon Sep 17 00:00:00 2001 From: Evgeniy Stepanov Date: Tue, 9 Feb 2016 00:28:57 +0000 Subject: [PATCH] [asan] Fix build on Windows and PowerPC. llvm-svn: 260175 --- compiler-rt/lib/sanitizer_common/sanitizer_linux.cc | 1 + compiler-rt/lib/sanitizer_common/sanitizer_win.cc | 8 ++++---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc index 8d153f4..631cdb4 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_linux.cc @@ -1202,6 +1202,7 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag(void *context) { if (!Aarch64GetESR(ucontext, &esr)) return UNKNOWN; return esr & ESR_ELx_WNR ? WRITE : READ; #else + (void)ucontext; return UNKNOWN; // FIXME: Implement. #endif } diff --git a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc index 278a0ab..18fd018 100644 --- a/compiler-rt/lib/sanitizer_common/sanitizer_win.cc +++ b/compiler-rt/lib/sanitizer_common/sanitizer_win.cc @@ -731,8 +731,8 @@ bool IsAccessibleMemoryRange(uptr beg, uptr size) { } SignalContext SignalContext::Create(void *siginfo, void *context) { - EXCEPTION_RECORD *exception_record = (EXCEPTION_RECORD*)siginfo; - CONTEXT *context_record = (CONTEXT*)context; + EXCEPTION_RECORD *exception_record = (EXCEPTION_RECORD *)siginfo; + CONTEXT *context_record = (CONTEXT *)context; uptr pc = (uptr)exception_record->ExceptionAddress; #ifdef _WIN64 @@ -744,8 +744,8 @@ SignalContext SignalContext::Create(void *siginfo, void *context) { #endif uptr access_addr = exception_record->ExceptionInformation[1]; - bool write_flag = SignalContext::UNKNOWN; // FIXME: compute this. - bool is_memory_access = false; // FIXME: compute this. + WriteFlag write_flag = SignalContext::UNKNOWN; // FIXME: compute this. + bool is_memory_access = false; // FIXME: compute this. return SignalContext(context, access_addr, pc, sp, bp, is_memory_access, write_flag); } -- 2.7.4