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
59 lines
2.6 KiB
C++
59 lines
2.6 KiB
C++
//===-- tsan_malloc_mac.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.
|
|
//
|
|
// Mac-specific malloc interception.
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "sanitizer_common/sanitizer_platform.h"
|
|
#if SANITIZER_MAC
|
|
|
|
#include "tsan_interceptors.h"
|
|
#include "tsan_stack_trace.h"
|
|
|
|
using namespace __tsan;
|
|
#define COMMON_MALLOC_ZONE_NAME "tsan"
|
|
#define COMMON_MALLOC_ENTER()
|
|
#define COMMON_MALLOC_SANITIZER_INITIALIZED (cur_thread()->is_inited)
|
|
#define COMMON_MALLOC_FORCE_LOCK()
|
|
#define COMMON_MALLOC_FORCE_UNLOCK()
|
|
#define COMMON_MALLOC_MEMALIGN(alignment, size) \
|
|
void *p = \
|
|
user_memalign(cur_thread(), StackTrace::GetCurrentPc(), alignment, size)
|
|
#define COMMON_MALLOC_MALLOC(size) \
|
|
if (cur_thread()->in_symbolizer) return InternalAlloc(size); \
|
|
SCOPED_INTERCEPTOR_RAW(malloc, size); \
|
|
void *p = user_alloc(thr, pc, size)
|
|
#define COMMON_MALLOC_REALLOC(ptr, size) \
|
|
if (cur_thread()->in_symbolizer) return InternalRealloc(ptr, size); \
|
|
SCOPED_INTERCEPTOR_RAW(realloc, ptr, size); \
|
|
void *p = user_realloc(thr, pc, ptr, size)
|
|
#define COMMON_MALLOC_CALLOC(count, size) \
|
|
if (cur_thread()->in_symbolizer) return InternalCalloc(count, size); \
|
|
SCOPED_INTERCEPTOR_RAW(calloc, size, count); \
|
|
void *p = user_calloc(thr, pc, size, count)
|
|
#define COMMON_MALLOC_VALLOC(size) \
|
|
if (cur_thread()->in_symbolizer) \
|
|
return InternalAlloc(size, nullptr, GetPageSizeCached()); \
|
|
SCOPED_INTERCEPTOR_RAW(valloc, size); \
|
|
void *p = user_valloc(thr, pc, size)
|
|
#define COMMON_MALLOC_FREE(ptr) \
|
|
if (cur_thread()->in_symbolizer) return InternalFree(ptr); \
|
|
SCOPED_INTERCEPTOR_RAW(free, ptr); \
|
|
user_free(thr, pc, ptr)
|
|
#define COMMON_MALLOC_SIZE(ptr) uptr size = user_alloc_usable_size(ptr);
|
|
#define COMMON_MALLOC_FILL_STATS(zone, stats)
|
|
#define COMMON_MALLOC_REPORT_UNKNOWN_REALLOC(ptr, zone_ptr, zone_name) \
|
|
(void)zone_name; \
|
|
Report("mz_realloc(%p) -- attempting to realloc unallocated memory.\n", ptr);
|
|
#define COMMON_MALLOC_NAMESPACE __tsan
|
|
|
|
#include "sanitizer_common/sanitizer_malloc_mac.inc"
|
|
|
|
#endif
|