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
134 lines
3.6 KiB
C++
134 lines
3.6 KiB
C++
//===-- tsan_interface.cc -------------------------------------------------===//
|
|
//
|
|
// 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_interface_ann.h"
|
|
#include "tsan_rtl.h"
|
|
#include "sanitizer_common/sanitizer_internal_defs.h"
|
|
|
|
#define CALLERPC ((uptr)__builtin_return_address(0))
|
|
|
|
using namespace __tsan; // NOLINT
|
|
|
|
typedef u16 uint16_t;
|
|
typedef u32 uint32_t;
|
|
typedef u64 uint64_t;
|
|
|
|
void __tsan_init() {
|
|
Initialize(cur_thread());
|
|
}
|
|
|
|
void __tsan_flush_memory() {
|
|
FlushShadowMemory();
|
|
}
|
|
|
|
void __tsan_read16(void *addr) {
|
|
MemoryRead(cur_thread(), CALLERPC, (uptr)addr, kSizeLog8);
|
|
MemoryRead(cur_thread(), CALLERPC, (uptr)addr + 8, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_write16(void *addr) {
|
|
MemoryWrite(cur_thread(), CALLERPC, (uptr)addr, kSizeLog8);
|
|
MemoryWrite(cur_thread(), CALLERPC, (uptr)addr + 8, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_read16_pc(void *addr, void *pc) {
|
|
MemoryRead(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog8);
|
|
MemoryRead(cur_thread(), (uptr)pc, (uptr)addr + 8, kSizeLog8);
|
|
}
|
|
|
|
void __tsan_write16_pc(void *addr, void *pc) {
|
|
MemoryWrite(cur_thread(), (uptr)pc, (uptr)addr, kSizeLog8);
|
|
MemoryWrite(cur_thread(), (uptr)pc, (uptr)addr + 8, kSizeLog8);
|
|
}
|
|
|
|
// __tsan_unaligned_read/write calls are emitted by compiler.
|
|
|
|
void __tsan_unaligned_read2(const void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 2, false, false);
|
|
}
|
|
|
|
void __tsan_unaligned_read4(const void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 4, false, false);
|
|
}
|
|
|
|
void __tsan_unaligned_read8(const void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 8, false, false);
|
|
}
|
|
|
|
void __tsan_unaligned_read16(const void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 16, false, false);
|
|
}
|
|
|
|
void __tsan_unaligned_write2(void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 2, true, false);
|
|
}
|
|
|
|
void __tsan_unaligned_write4(void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 4, true, false);
|
|
}
|
|
|
|
void __tsan_unaligned_write8(void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 8, true, false);
|
|
}
|
|
|
|
void __tsan_unaligned_write16(void *addr) {
|
|
UnalignedMemoryAccess(cur_thread(), CALLERPC, (uptr)addr, 16, true, false);
|
|
}
|
|
|
|
// __sanitizer_unaligned_load/store are for user instrumentation.
|
|
|
|
extern "C" {
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
u16 __sanitizer_unaligned_load16(const uu16 *addr) {
|
|
__tsan_unaligned_read2(addr);
|
|
return *addr;
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
u32 __sanitizer_unaligned_load32(const uu32 *addr) {
|
|
__tsan_unaligned_read4(addr);
|
|
return *addr;
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
u64 __sanitizer_unaligned_load64(const uu64 *addr) {
|
|
__tsan_unaligned_read8(addr);
|
|
return *addr;
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void __sanitizer_unaligned_store16(uu16 *addr, u16 v) {
|
|
__tsan_unaligned_write2(addr);
|
|
*addr = v;
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void __sanitizer_unaligned_store32(uu32 *addr, u32 v) {
|
|
__tsan_unaligned_write4(addr);
|
|
*addr = v;
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void __sanitizer_unaligned_store64(uu64 *addr, u64 v) {
|
|
__tsan_unaligned_write8(addr);
|
|
*addr = v;
|
|
}
|
|
} // extern "C"
|
|
|
|
void __tsan_acquire(void *addr) {
|
|
Acquire(cur_thread(), CALLERPC, (uptr)addr);
|
|
}
|
|
|
|
void __tsan_release(void *addr) {
|
|
Release(cur_thread(), CALLERPC, (uptr)addr);
|
|
}
|