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
53 lines
1.4 KiB
C++
53 lines
1.4 KiB
C++
#ifndef TSAN_INTERCEPTORS_H
|
|
#define TSAN_INTERCEPTORS_H
|
|
|
|
#include "sanitizer_common/sanitizer_stacktrace.h"
|
|
#include "tsan_rtl.h"
|
|
|
|
namespace __tsan {
|
|
|
|
class ScopedInterceptor {
|
|
public:
|
|
ScopedInterceptor(ThreadState *thr, const char *fname, uptr pc);
|
|
~ScopedInterceptor();
|
|
void DisableIgnores();
|
|
void EnableIgnores();
|
|
private:
|
|
ThreadState *const thr_;
|
|
const uptr pc_;
|
|
bool in_ignored_lib_;
|
|
bool ignoring_;
|
|
};
|
|
|
|
LibIgnore *libignore();
|
|
|
|
} // namespace __tsan
|
|
|
|
#define SCOPED_INTERCEPTOR_RAW(func, ...) \
|
|
ThreadState *thr = cur_thread(); \
|
|
const uptr caller_pc = GET_CALLER_PC(); \
|
|
ScopedInterceptor si(thr, #func, caller_pc); \
|
|
const uptr pc = StackTrace::GetCurrentPc(); \
|
|
(void)pc; \
|
|
/**/
|
|
|
|
#define SCOPED_TSAN_INTERCEPTOR(func, ...) \
|
|
SCOPED_INTERCEPTOR_RAW(func, __VA_ARGS__); \
|
|
if (REAL(func) == 0) { \
|
|
Report("FATAL: ThreadSanitizer: failed to intercept %s\n", #func); \
|
|
Die(); \
|
|
} \
|
|
if (!thr->is_inited || thr->ignore_interceptors || thr->in_ignored_lib) \
|
|
return REAL(func)(__VA_ARGS__); \
|
|
/**/
|
|
|
|
#define SCOPED_TSAN_INTERCEPTOR_USER_CALLBACK_START() \
|
|
si.DisableIgnores();
|
|
|
|
#define SCOPED_TSAN_INTERCEPTOR_USER_CALLBACK_END() \
|
|
si.EnableIgnores();
|
|
|
|
#define TSAN_INTERCEPTOR(ret, func, ...) INTERCEPTOR(ret, func, __VA_ARGS__)
|
|
|
|
#endif // TSAN_INTERCEPTORS_H
|