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
89 lines
2.5 KiB
C++
89 lines
2.5 KiB
C++
//===-- tsan_mman.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 (TSan), a race detector.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
#ifndef TSAN_MMAN_H
|
|
#define TSAN_MMAN_H
|
|
|
|
#include "tsan_defs.h"
|
|
|
|
namespace __tsan {
|
|
|
|
const uptr kDefaultAlignment = 16;
|
|
|
|
void InitializeAllocator();
|
|
void InitializeAllocatorLate();
|
|
void ReplaceSystemMalloc();
|
|
void AllocatorProcStart(Processor *proc);
|
|
void AllocatorProcFinish(Processor *proc);
|
|
void AllocatorPrintStats();
|
|
|
|
// For user allocations.
|
|
void *user_alloc_internal(ThreadState *thr, uptr pc, uptr sz,
|
|
uptr align = kDefaultAlignment, bool signal = true);
|
|
// Does not accept NULL.
|
|
void user_free(ThreadState *thr, uptr pc, void *p, bool signal = true);
|
|
// Interceptor implementations.
|
|
void *user_alloc(ThreadState *thr, uptr pc, uptr sz);
|
|
void *user_calloc(ThreadState *thr, uptr pc, uptr sz, uptr n);
|
|
void *user_realloc(ThreadState *thr, uptr pc, void *p, uptr sz);
|
|
void *user_memalign(ThreadState *thr, uptr pc, uptr align, uptr sz);
|
|
int user_posix_memalign(ThreadState *thr, uptr pc, void **memptr, uptr align,
|
|
uptr sz);
|
|
void *user_aligned_alloc(ThreadState *thr, uptr pc, uptr align, uptr sz);
|
|
void *user_valloc(ThreadState *thr, uptr pc, uptr sz);
|
|
void *user_pvalloc(ThreadState *thr, uptr pc, uptr sz);
|
|
uptr user_alloc_usable_size(const void *p);
|
|
|
|
// Invoking malloc/free hooks that may be installed by the user.
|
|
void invoke_malloc_hook(void *ptr, uptr size);
|
|
void invoke_free_hook(void *ptr);
|
|
|
|
enum MBlockType {
|
|
MBlockScopedBuf,
|
|
MBlockString,
|
|
MBlockStackTrace,
|
|
MBlockShadowStack,
|
|
MBlockSync,
|
|
MBlockClock,
|
|
MBlockThreadContex,
|
|
MBlockDeadInfo,
|
|
MBlockRacyStacks,
|
|
MBlockRacyAddresses,
|
|
MBlockAtExit,
|
|
MBlockFlag,
|
|
MBlockReport,
|
|
MBlockReportMop,
|
|
MBlockReportThread,
|
|
MBlockReportMutex,
|
|
MBlockReportLoc,
|
|
MBlockReportStack,
|
|
MBlockSuppression,
|
|
MBlockExpectRace,
|
|
MBlockSignal,
|
|
MBlockJmpBuf,
|
|
|
|
// This must be the last.
|
|
MBlockTypeCount
|
|
};
|
|
|
|
// For internal data structures.
|
|
void *internal_alloc(MBlockType typ, uptr sz);
|
|
void internal_free(void *p);
|
|
|
|
template<typename T>
|
|
void DestroyAndFree(T *&p) {
|
|
p->~T();
|
|
internal_free(p);
|
|
p = 0;
|
|
}
|
|
|
|
} // namespace __tsan
|
|
#endif // TSAN_MMAN_H
|