mirror of
https://gcc.gnu.org/git/gcc.git
synced 2024-11-23 19:03:59 +08:00
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
94 lines
2.9 KiB
C++
94 lines
2.9 KiB
C++
//===-- tsan_new_delete.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.
|
|
//
|
|
// Interceptors for operators new and delete.
|
|
//===----------------------------------------------------------------------===//
|
|
#include "interception/interception.h"
|
|
#include "sanitizer_common/sanitizer_allocator.h"
|
|
#include "sanitizer_common/sanitizer_internal_defs.h"
|
|
#include "tsan_interceptors.h"
|
|
|
|
using namespace __tsan; // NOLINT
|
|
|
|
namespace std {
|
|
struct nothrow_t {};
|
|
} // namespace std
|
|
|
|
DECLARE_REAL(void *, malloc, uptr size)
|
|
DECLARE_REAL(void, free, void *ptr)
|
|
|
|
// TODO(alekseys): throw std::bad_alloc instead of dying on OOM.
|
|
#define OPERATOR_NEW_BODY(mangled_name, nothrow) \
|
|
if (cur_thread()->in_symbolizer) \
|
|
return InternalAlloc(size); \
|
|
void *p = 0; \
|
|
{ \
|
|
SCOPED_INTERCEPTOR_RAW(mangled_name, size); \
|
|
p = user_alloc(thr, pc, size); \
|
|
if (!nothrow && UNLIKELY(!p)) DieOnFailure::OnOOM(); \
|
|
} \
|
|
invoke_malloc_hook(p, size); \
|
|
return p;
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void *operator new(__sanitizer::uptr size);
|
|
void *operator new(__sanitizer::uptr size) {
|
|
OPERATOR_NEW_BODY(_Znwm, false /*nothrow*/);
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void *operator new[](__sanitizer::uptr size);
|
|
void *operator new[](__sanitizer::uptr size) {
|
|
OPERATOR_NEW_BODY(_Znam, false /*nothrow*/);
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void *operator new(__sanitizer::uptr size, std::nothrow_t const&);
|
|
void *operator new(__sanitizer::uptr size, std::nothrow_t const&) {
|
|
OPERATOR_NEW_BODY(_ZnwmRKSt9nothrow_t, true /*nothrow*/);
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void *operator new[](__sanitizer::uptr size, std::nothrow_t const&);
|
|
void *operator new[](__sanitizer::uptr size, std::nothrow_t const&) {
|
|
OPERATOR_NEW_BODY(_ZnamRKSt9nothrow_t, true /*nothrow*/);
|
|
}
|
|
|
|
#define OPERATOR_DELETE_BODY(mangled_name) \
|
|
if (ptr == 0) return; \
|
|
if (cur_thread()->in_symbolizer) \
|
|
return InternalFree(ptr); \
|
|
invoke_free_hook(ptr); \
|
|
SCOPED_INTERCEPTOR_RAW(mangled_name, ptr); \
|
|
user_free(thr, pc, ptr);
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void operator delete(void *ptr) NOEXCEPT;
|
|
void operator delete(void *ptr) NOEXCEPT {
|
|
OPERATOR_DELETE_BODY(_ZdlPv);
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void operator delete[](void *ptr) NOEXCEPT;
|
|
void operator delete[](void *ptr) NOEXCEPT {
|
|
OPERATOR_DELETE_BODY(_ZdaPv);
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void operator delete(void *ptr, std::nothrow_t const&);
|
|
void operator delete(void *ptr, std::nothrow_t const&) {
|
|
OPERATOR_DELETE_BODY(_ZdlPvRKSt9nothrow_t);
|
|
}
|
|
|
|
SANITIZER_INTERFACE_ATTRIBUTE
|
|
void operator delete[](void *ptr, std::nothrow_t const&);
|
|
void operator delete[](void *ptr, std::nothrow_t const&) {
|
|
OPERATOR_DELETE_BODY(_ZdaPvRKSt9nothrow_t);
|
|
}
|