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
75 lines
1.8 KiB
C++
75 lines
1.8 KiB
C++
//===-- tsan_trace.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_TRACE_H
|
|
#define TSAN_TRACE_H
|
|
|
|
#include "tsan_defs.h"
|
|
#include "tsan_mutex.h"
|
|
#include "tsan_stack_trace.h"
|
|
#include "tsan_mutexset.h"
|
|
|
|
namespace __tsan {
|
|
|
|
const int kTracePartSizeBits = 13;
|
|
const int kTracePartSize = 1 << kTracePartSizeBits;
|
|
const int kTraceParts = 2 * 1024 * 1024 / kTracePartSize;
|
|
const int kTraceSize = kTracePartSize * kTraceParts;
|
|
|
|
// Must fit into 3 bits.
|
|
enum EventType {
|
|
EventTypeMop,
|
|
EventTypeFuncEnter,
|
|
EventTypeFuncExit,
|
|
EventTypeLock,
|
|
EventTypeUnlock,
|
|
EventTypeRLock,
|
|
EventTypeRUnlock
|
|
};
|
|
|
|
// Represents a thread event (from most significant bit):
|
|
// u64 typ : 3; // EventType.
|
|
// u64 addr : 61; // Associated pc.
|
|
typedef u64 Event;
|
|
|
|
const uptr kEventPCBits = 61;
|
|
|
|
struct TraceHeader {
|
|
#if !SANITIZER_GO
|
|
BufferedStackTrace stack0; // Start stack for the trace.
|
|
#else
|
|
VarSizeStackTrace stack0;
|
|
#endif
|
|
u64 epoch0; // Start epoch for the trace.
|
|
MutexSet mset0;
|
|
|
|
TraceHeader() : stack0(), epoch0() {}
|
|
};
|
|
|
|
struct Trace {
|
|
Mutex mtx;
|
|
#if !SANITIZER_GO
|
|
// Must be last to catch overflow as paging fault.
|
|
// Go shadow stack is dynamically allocated.
|
|
uptr shadow_stack[kShadowStackSize];
|
|
#endif
|
|
// Must be the last field, because we unmap the unused part in
|
|
// CreateThreadContext.
|
|
TraceHeader headers[kTraceParts];
|
|
|
|
Trace()
|
|
: mtx(MutexTypeTrace, StatMtxTrace) {
|
|
}
|
|
};
|
|
|
|
} // namespace __tsan
|
|
|
|
#endif // TSAN_TRACE_H
|