wangtao
/
llvm-project
forked from OSchip/llvm-project
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

[asan] Fix build on Windows and PowerPC. 

llvm-svn: 260175
This commit is contained in:
Evgeniy Stepanov 2016-02-09 00:28:57 +00:00
parent fc1cab305f
commit aa42f29221
2 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
compiler-rt/lib/sanitizer_common/sanitizer_linux.cc
View File

@ -1202,6 +1202,7 @@ SignalContext::WriteFlag SignalContext::GetWriteFlag(void *context) {
if (!Aarch64GetESR(ucontext, &esr)) return UNKNOWN; if (!Aarch64GetESR(ucontext, &esr)) return UNKNOWN;
return esr & ESR_ELx_WNR ? WRITE : READ; return esr & ESR_ELx_WNR ? WRITE : READ;
#else #else
(void)ucontext;
return UNKNOWN; // FIXME: Implement. return UNKNOWN; // FIXME: Implement.
#endif #endif
} }

6
compiler-rt/lib/sanitizer_common/sanitizer_win.cc
View File

@ -731,8 +731,8 @@ bool IsAccessibleMemoryRange(uptr beg, uptr size) {
} }
SignalContext SignalContext::Create(void *siginfo, void *context) { SignalContext SignalContext::Create(void *siginfo, void *context) {
EXCEPTION_RECORD *exception_record = (EXCEPTION_RECORD*)siginfo; EXCEPTION_RECORD *exception_record = (EXCEPTION_RECORD *)siginfo;
CONTEXT *context_record = (CONTEXT*)context; CONTEXT *context_record = (CONTEXT *)context;
uptr pc = (uptr)exception_record->ExceptionAddress; uptr pc = (uptr)exception_record->ExceptionAddress;
#ifdef _WIN64 #ifdef _WIN64
@ -744,7 +744,7 @@ SignalContext SignalContext::Create(void *siginfo, void *context) {
#endif #endif
uptr access_addr = exception_record->ExceptionInformation[1]; uptr access_addr = exception_record->ExceptionInformation[1];
bool write_flag = SignalContext::UNKNOWN; // FIXME: compute this. WriteFlag write_flag = SignalContext::UNKNOWN; // FIXME: compute this.
bool is_memory_access = false; // FIXME: compute this. bool is_memory_access = false; // FIXME: compute this.
return SignalContext(context, access_addr, pc, sp, bp, is_memory_access, return SignalContext(context, access_addr, pc, sp, bp, is_memory_access,
write_flag); write_flag);