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
108 lines
3.4 KiB
C++
108 lines
3.4 KiB
C++
//===-- sanitizer_atomic_clang.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/AddressSanitizer runtime.
|
|
// Not intended for direct inclusion. Include sanitizer_atomic.h.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SANITIZER_ATOMIC_CLANG_H
|
|
#define SANITIZER_ATOMIC_CLANG_H
|
|
|
|
#if defined(__i386__) || defined(__x86_64__)
|
|
# include "sanitizer_atomic_clang_x86.h"
|
|
#else
|
|
# include "sanitizer_atomic_clang_other.h"
|
|
#endif
|
|
|
|
namespace __sanitizer {
|
|
|
|
// We would like to just use compiler builtin atomic operations
|
|
// for loads and stores, but they are mostly broken in clang:
|
|
// - they lead to vastly inefficient code generation
|
|
// (http://llvm.org/bugs/show_bug.cgi?id=17281)
|
|
// - 64-bit atomic operations are not implemented on x86_32
|
|
// (http://llvm.org/bugs/show_bug.cgi?id=15034)
|
|
// - they are not implemented on ARM
|
|
// error: undefined reference to '__atomic_load_4'
|
|
|
|
// See http://www.cl.cam.ac.uk/~pes20/cpp/cpp0xmappings.html
|
|
// for mappings of the memory model to different processors.
|
|
|
|
INLINE void atomic_signal_fence(memory_order) {
|
|
__asm__ __volatile__("" ::: "memory");
|
|
}
|
|
|
|
INLINE void atomic_thread_fence(memory_order) {
|
|
__sync_synchronize();
|
|
}
|
|
|
|
template<typename T>
|
|
INLINE typename T::Type atomic_fetch_add(volatile T *a,
|
|
typename T::Type v, memory_order mo) {
|
|
(void)mo;
|
|
DCHECK(!((uptr)a % sizeof(*a)));
|
|
return __sync_fetch_and_add(&a->val_dont_use, v);
|
|
}
|
|
|
|
template<typename T>
|
|
INLINE typename T::Type atomic_fetch_sub(volatile T *a,
|
|
typename T::Type v, memory_order mo) {
|
|
(void)mo;
|
|
DCHECK(!((uptr)a % sizeof(*a)));
|
|
return __sync_fetch_and_add(&a->val_dont_use, -v);
|
|
}
|
|
|
|
template<typename T>
|
|
INLINE typename T::Type atomic_exchange(volatile T *a,
|
|
typename T::Type v, memory_order mo) {
|
|
DCHECK(!((uptr)a % sizeof(*a)));
|
|
if (mo & (memory_order_release | memory_order_acq_rel | memory_order_seq_cst))
|
|
__sync_synchronize();
|
|
v = __sync_lock_test_and_set(&a->val_dont_use, v);
|
|
if (mo == memory_order_seq_cst)
|
|
__sync_synchronize();
|
|
return v;
|
|
}
|
|
|
|
template <typename T>
|
|
INLINE bool atomic_compare_exchange_strong(volatile T *a, typename T::Type *cmp,
|
|
typename T::Type xchg,
|
|
memory_order mo) {
|
|
typedef typename T::Type Type;
|
|
Type cmpv = *cmp;
|
|
Type prev;
|
|
#if defined(_MIPS_SIM) && _MIPS_SIM == _ABIO32
|
|
if (sizeof(*a) == 8) {
|
|
Type volatile *val_ptr = const_cast<Type volatile *>(&a->val_dont_use);
|
|
prev = __mips_sync_val_compare_and_swap<u64>(
|
|
reinterpret_cast<u64 volatile *>(val_ptr), (u64)cmpv, (u64)xchg);
|
|
} else {
|
|
prev = __sync_val_compare_and_swap(&a->val_dont_use, cmpv, xchg);
|
|
}
|
|
#else
|
|
prev = __sync_val_compare_and_swap(&a->val_dont_use, cmpv, xchg);
|
|
#endif
|
|
if (prev == cmpv) return true;
|
|
*cmp = prev;
|
|
return false;
|
|
}
|
|
|
|
template<typename T>
|
|
INLINE bool atomic_compare_exchange_weak(volatile T *a,
|
|
typename T::Type *cmp,
|
|
typename T::Type xchg,
|
|
memory_order mo) {
|
|
return atomic_compare_exchange_strong(a, cmp, xchg, mo);
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#undef ATOMIC_ORDER
|
|
|
|
#endif // SANITIZER_ATOMIC_CLANG_H
|