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
86 lines
1.9 KiB
C++
86 lines
1.9 KiB
C++
//===-- sanitizer_atomic.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.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SANITIZER_ATOMIC_H
|
|
#define SANITIZER_ATOMIC_H
|
|
|
|
#include "sanitizer_internal_defs.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
enum memory_order {
|
|
memory_order_relaxed = 1 << 0,
|
|
memory_order_consume = 1 << 1,
|
|
memory_order_acquire = 1 << 2,
|
|
memory_order_release = 1 << 3,
|
|
memory_order_acq_rel = 1 << 4,
|
|
memory_order_seq_cst = 1 << 5
|
|
};
|
|
|
|
struct atomic_uint8_t {
|
|
typedef u8 Type;
|
|
volatile Type val_dont_use;
|
|
};
|
|
|
|
struct atomic_uint16_t {
|
|
typedef u16 Type;
|
|
volatile Type val_dont_use;
|
|
};
|
|
|
|
struct atomic_sint32_t {
|
|
typedef s32 Type;
|
|
volatile Type val_dont_use;
|
|
};
|
|
|
|
struct atomic_uint32_t {
|
|
typedef u32 Type;
|
|
volatile Type val_dont_use;
|
|
};
|
|
|
|
struct atomic_uint64_t {
|
|
typedef u64 Type;
|
|
// On 32-bit platforms u64 is not necessary aligned on 8 bytes.
|
|
volatile ALIGNED(8) Type val_dont_use;
|
|
};
|
|
|
|
struct atomic_uintptr_t {
|
|
typedef uptr Type;
|
|
volatile Type val_dont_use;
|
|
};
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#if defined(__clang__) || defined(__GNUC__)
|
|
# include "sanitizer_atomic_clang.h"
|
|
#elif defined(_MSC_VER)
|
|
# include "sanitizer_atomic_msvc.h"
|
|
#else
|
|
# error "Unsupported compiler"
|
|
#endif
|
|
|
|
namespace __sanitizer {
|
|
|
|
// Clutter-reducing helpers.
|
|
|
|
template<typename T>
|
|
INLINE typename T::Type atomic_load_relaxed(const volatile T *a) {
|
|
return atomic_load(a, memory_order_relaxed);
|
|
}
|
|
|
|
template<typename T>
|
|
INLINE void atomic_store_relaxed(volatile T *a, typename T::Type v) {
|
|
atomic_store(a, v, memory_order_relaxed);
|
|
}
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_ATOMIC_H
|