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
69 lines
2.2 KiB
C++
69 lines
2.2 KiB
C++
//===-- sanitizer_allocator.h -----------------------------------*- C++ -*-===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Specialized memory allocator for ThreadSanitizer, MemorySanitizer, etc.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#ifndef SANITIZER_ALLOCATOR_H
|
|
#define SANITIZER_ALLOCATOR_H
|
|
|
|
#include "sanitizer_internal_defs.h"
|
|
#include "sanitizer_common.h"
|
|
#include "sanitizer_libc.h"
|
|
#include "sanitizer_list.h"
|
|
#include "sanitizer_mutex.h"
|
|
#include "sanitizer_lfstack.h"
|
|
#include "sanitizer_procmaps.h"
|
|
|
|
namespace __sanitizer {
|
|
|
|
// Since flags are immutable and allocator behavior can be changed at runtime
|
|
// (unit tests or ASan on Android are some examples), allocator_may_return_null
|
|
// flag value is cached here and can be altered later.
|
|
bool AllocatorMayReturnNull();
|
|
void SetAllocatorMayReturnNull(bool may_return_null);
|
|
|
|
// Allocator failure handling policies:
|
|
// Implements AllocatorMayReturnNull policy, returns null when the flag is set,
|
|
// dies otherwise.
|
|
struct ReturnNullOrDieOnFailure {
|
|
static void *OnBadRequest();
|
|
static void *OnOOM();
|
|
};
|
|
// Always dies on the failure.
|
|
struct DieOnFailure {
|
|
static void NORETURN *OnBadRequest();
|
|
static void NORETURN *OnOOM();
|
|
};
|
|
|
|
// Returns true if allocator detected OOM condition. Can be used to avoid memory
|
|
// hungry operations. Set when AllocatorReturnNullOrDieOnOOM() is called.
|
|
bool IsAllocatorOutOfMemory();
|
|
|
|
// Allocators call these callbacks on mmap/munmap.
|
|
struct NoOpMapUnmapCallback {
|
|
void OnMap(uptr p, uptr size) const { }
|
|
void OnUnmap(uptr p, uptr size) const { }
|
|
};
|
|
|
|
// Callback type for iterating over chunks.
|
|
typedef void (*ForEachChunkCallback)(uptr chunk, void *arg);
|
|
|
|
#include "sanitizer_allocator_size_class_map.h"
|
|
#include "sanitizer_allocator_stats.h"
|
|
#include "sanitizer_allocator_primary64.h"
|
|
#include "sanitizer_allocator_bytemap.h"
|
|
#include "sanitizer_allocator_primary32.h"
|
|
#include "sanitizer_allocator_local_cache.h"
|
|
#include "sanitizer_allocator_secondary.h"
|
|
#include "sanitizer_allocator_combined.h"
|
|
|
|
} // namespace __sanitizer
|
|
|
|
#endif // SANITIZER_ALLOCATOR_H
|