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
61 lines
1.9 KiB
C++
61 lines
1.9 KiB
C++
//===-- asan_globals_win.cc -----------------------------------------------===//
|
|
//
|
|
// This file is distributed under the University of Illinois Open Source
|
|
// License. See LICENSE.TXT for details.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
//
|
|
// Global registration code that is linked into every Windows DLL and EXE.
|
|
//
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
#include "asan_interface_internal.h"
|
|
#if SANITIZER_WINDOWS
|
|
|
|
namespace __asan {
|
|
|
|
#pragma section(".ASAN$GA", read, write) // NOLINT
|
|
#pragma section(".ASAN$GZ", read, write) // NOLINT
|
|
extern "C" __declspec(allocate(".ASAN$GA"))
|
|
__asan_global __asan_globals_start = {};
|
|
extern "C" __declspec(allocate(".ASAN$GZ"))
|
|
__asan_global __asan_globals_end = {};
|
|
#pragma comment(linker, "/merge:.ASAN=.data")
|
|
|
|
static void call_on_globals(void (*hook)(__asan_global *, uptr)) {
|
|
__asan_global *start = &__asan_globals_start + 1;
|
|
__asan_global *end = &__asan_globals_end;
|
|
uptr bytediff = (uptr)end - (uptr)start;
|
|
if (bytediff % sizeof(__asan_global) != 0) {
|
|
#ifdef SANITIZER_DLL_THUNK
|
|
__debugbreak();
|
|
#else
|
|
CHECK("corrupt asan global array");
|
|
#endif
|
|
}
|
|
// We know end >= start because the linker sorts the portion after the dollar
|
|
// sign alphabetically.
|
|
uptr n = end - start;
|
|
hook(start, n);
|
|
}
|
|
|
|
static void register_dso_globals() {
|
|
call_on_globals(&__asan_register_globals);
|
|
}
|
|
|
|
static void unregister_dso_globals() {
|
|
call_on_globals(&__asan_unregister_globals);
|
|
}
|
|
|
|
// Register globals
|
|
#pragma section(".CRT$XCU", long, read) // NOLINT
|
|
#pragma section(".CRT$XTX", long, read) // NOLINT
|
|
extern "C" __declspec(allocate(".CRT$XCU"))
|
|
void (*const __asan_dso_reg_hook)() = ®ister_dso_globals;
|
|
extern "C" __declspec(allocate(".CRT$XTX"))
|
|
void (*const __asan_dso_unreg_hook)() = &unregister_dso_globals;
|
|
|
|
} // namespace __asan
|
|
|
|
#endif // SANITIZER_WINDOWS
|