5d3805fca3
* ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch
builtins, store max (log2 (align), 0) into uchar field instead of
align into uptr field.
(ubsan_expand_objsize_ifn): Use _v1 suffixed type mismatch builtins,
store uchar 0 field instead of uptr 0 field.
(instrument_nonnull_return): Use _v1 suffixed nonnull return builtin,
instead of passing one address of struct with 2 locations pass
two addresses of structs with 1 location each.
* sanitizer.def (BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH,
BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_ABORT,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_ABORT): Removed.
(BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1,
BUILT_IN_UBSAN_HANDLE_TYPE_MISMATCH_V1_ABORT,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1,
BUILT_IN_UBSAN_HANDLE_NONNULL_RETURN_V1_ABORT): New builtins.
* c-c++-common/ubsan/float-cast-overflow-1.c: Drop value keyword
from expected output regexps.
* c-c++-common/ubsan/float-cast-overflow-2.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-3.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-4.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-5.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-6.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-8.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-9.c: Likewise.
* c-c++-common/ubsan/float-cast-overflow-10.c: Likewise.
* g++.dg/ubsan/float-cast-overflow-bf.C: Likewise.
* gcc.dg/ubsan/float-cast-overflow-bf.c: Likewise.
* g++.dg/asan/default-options-1.C (__asan_default_options): Add
used attribute.
* g++.dg/asan/asan_test.C: Run with ASAN_OPTIONS=handle_segv=2
in the environment.
* All source files: Merge from upstream 315899.
* asan/Makefile.am (nodist_saninclude_HEADERS): Add
include/sanitizer/tsan_interface.h.
* asan/libtool-version: Bump the libasan SONAME.
* lsan/Makefile.am (sanitizer_lsan_files): Add lsan_common_mac.cc.
(lsan_files): Add lsan_linux.cc, lsan_mac.cc and lsan_malloc_mac.cc.
* sanitizer_common/Makefile.am (sanitizer_common_files): Add
sancov_flags.cc, sanitizer_allocator_checks.cc,
sanitizer_coverage_libcdep_new.cc, sanitizer_errno.cc,
sanitizer_file.cc, sanitizer_mac_libcdep.cc and
sanitizer_stoptheworld_mac.cc. Remove sanitizer_coverage_libcdep.cc
and sanitizer_coverage_mapping_libcdep.cc.
* tsan/Makefile.am (tsan_files): Add tsan_external.cc.
* ubsan/Makefile.am (DEFS): Add -DUBSAN_CAN_USE_CXXABI=1.
(ubsan_files): Add ubsan_init_standalone.cc and
ubsan_signals_standalone.cc.
* ubsan/libtool-version: Bump the libubsan SONAME.
* asan/Makefile.in: Regenerate.
* lsan/Makefile.in: Regenerate.
* sanitizer_common/Makefile.in: Regenerate.
* tsan/Makefile.in: Regenerate.
* ubsan/Makefile.in: Regenerate.
From-SVN: r253887
124 lines
3.2 KiB
C++
124 lines
3.2 KiB
C++
//===-- tsan_interface_inl.h ------------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// This file is a part of ThreadSanitizer (TSan), a race detector.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "tsan_interface.h"
|
|
#include "tsan_rtl.h"
|
|
|
|
#define CALLERPC ((uptr)__builtin_return_address(0))
|
|
|
|
using namespace __tsan; // NOLINT
|
|
|
|
void __tsan_read1(void *addr) {
|
|
MemoryRead(cur_thread(), CALLERPC, (uptr)addr, kSizeLog1);
|
|
}
|
|
|
|
void __tsan_read2(void *addr) {
|
|
MemoryRead(cur_thread(), CALLERPC, (uptr)addr, kSizeLog2);
|
|
}
|
|
|
|
void __tsan_read4(void *addr) {
|
|
MemoryRead(cur_thread(), CALLERPC, (uptr)addr, kSizeLog4);
|
|
}
|
|
|
|
void __tsan_read8(void *addr) {
|
|
MemoryRead(cur_thread(), CALLERPC, (uptr)addr, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_write1(void *addr) {
|
|
MemoryWrite(cur_thread(), CALLERPC, (uptr)addr, kSizeLog1);
|
|
}
|
|
|
|
void __tsan_write2(void *addr) {
|
|
MemoryWrite(cur_thread(), CALLERPC, (uptr)addr, kSizeLog2);
|
|
}
|
|
|
|
void __tsan_write4(void *addr) {
|
|
MemoryWrite(cur_thread(), CALLERPC, (uptr)addr, kSizeLog4);
|
|
}
|
|
|
|
void __tsan_write8(void *addr) {
|
|
MemoryWrite(cur_thread(), CALLERPC, (uptr)addr, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_read1_pc(void *addr, void *pc) {
|
|
MemoryRead(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog1);
|
|
}
|
|
|
|
void __tsan_read2_pc(void *addr, void *pc) {
|
|
MemoryRead(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog2);
|
|
}
|
|
|
|
void __tsan_read4_pc(void *addr, void *pc) {
|
|
MemoryRead(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog4);
|
|
}
|
|
|
|
void __tsan_read8_pc(void *addr, void *pc) {
|
|
MemoryRead(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_write1_pc(void *addr, void *pc) {
|
|
MemoryWrite(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog1);
|
|
}
|
|
|
|
void __tsan_write2_pc(void *addr, void *pc) {
|
|
MemoryWrite(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog2);
|
|
}
|
|
|
|
void __tsan_write4_pc(void *addr, void *pc) {
|
|
MemoryWrite(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog4);
|
|
}
|
|
|
|
void __tsan_write8_pc(void *addr, void *pc) {
|
|
MemoryWrite(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_vptr_update(void **vptr_p, void *new_val) {
|
|
CHECK_EQ(sizeof(vptr_p), 8);
|
|
if (*vptr_p != new_val) {
|
|
ThreadState *thr = cur_thread();
|
|
thr->is_vptr_access = true;
|
|
MemoryWrite(thr, CALLERPC, (uptr)vptr_p, kSizeLog8);
|
|
thr->is_vptr_access = false;
|
|
}
|
|
}
|
|
|
|
void __tsan_vptr_read(void **vptr_p) {
|
|
CHECK_EQ(sizeof(vptr_p), 8);
|
|
ThreadState *thr = cur_thread();
|
|
thr->is_vptr_access = true;
|
|
MemoryRead(thr, CALLERPC, (uptr)vptr_p, kSizeLog8);
|
|
thr->is_vptr_access = false;
|
|
}
|
|
|
|
void __tsan_func_entry(void *pc) {
|
|
FuncEntry(cur_thread(), (uptr)pc);
|
|
}
|
|
|
|
void __tsan_func_exit() {
|
|
FuncExit(cur_thread());
|
|
}
|
|
|
|
void __tsan_ignore_thread_begin() {
|
|
ThreadIgnoreBegin(cur_thread(), CALLERPC);
|
|
}
|
|
|
|
void __tsan_ignore_thread_end() {
|
|
ThreadIgnoreEnd(cur_thread(), CALLERPC);
|
|
}
|
|
|
|
void __tsan_read_range(void *addr, uptr size) {
|
|
MemoryAccessRange(cur_thread(), CALLERPC, (uptr)addr, size, false);
|
|
}
|
|
|
|
void __tsan_write_range(void *addr, uptr size) {
|
|
MemoryAccessRange(cur_thread(), CALLERPC, (uptr)addr, size, true);
|
|
}
|