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
134 lines
2.6 KiB
C++
134 lines
2.6 KiB
C++
//===-- tsan_report.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_REPORT_H
|
|
#define TSAN_REPORT_H
|
|
|
|
#include "sanitizer_common/sanitizer_symbolizer.h"
|
|
#include "tsan_defs.h"
|
|
#include "tsan_vector.h"
|
|
|
|
namespace __tsan {
|
|
|
|
enum ReportType {
|
|
ReportTypeRace,
|
|
ReportTypeVptrRace,
|
|
ReportTypeUseAfterFree,
|
|
ReportTypeVptrUseAfterFree,
|
|
ReportTypeExternalRace,
|
|
ReportTypeThreadLeak,
|
|
ReportTypeMutexDestroyLocked,
|
|
ReportTypeMutexDoubleLock,
|
|
ReportTypeMutexInvalidAccess,
|
|
ReportTypeMutexBadUnlock,
|
|
ReportTypeMutexBadReadLock,
|
|
ReportTypeMutexBadReadUnlock,
|
|
ReportTypeSignalUnsafe,
|
|
ReportTypeErrnoInSignal,
|
|
ReportTypeDeadlock
|
|
};
|
|
|
|
struct ReportStack {
|
|
SymbolizedStack *frames;
|
|
bool suppressable;
|
|
static ReportStack *New();
|
|
|
|
private:
|
|
ReportStack();
|
|
};
|
|
|
|
struct ReportMopMutex {
|
|
u64 id;
|
|
bool write;
|
|
};
|
|
|
|
struct ReportMop {
|
|
int tid;
|
|
uptr addr;
|
|
int size;
|
|
bool write;
|
|
bool atomic;
|
|
uptr external_tag;
|
|
Vector<ReportMopMutex> mset;
|
|
ReportStack *stack;
|
|
|
|
ReportMop();
|
|
};
|
|
|
|
enum ReportLocationType {
|
|
ReportLocationGlobal,
|
|
ReportLocationHeap,
|
|
ReportLocationStack,
|
|
ReportLocationTLS,
|
|
ReportLocationFD
|
|
};
|
|
|
|
struct ReportLocation {
|
|
ReportLocationType type;
|
|
DataInfo global;
|
|
uptr heap_chunk_start;
|
|
uptr heap_chunk_size;
|
|
uptr external_tag;
|
|
int tid;
|
|
int fd;
|
|
bool suppressable;
|
|
ReportStack *stack;
|
|
|
|
static ReportLocation *New(ReportLocationType type);
|
|
private:
|
|
explicit ReportLocation(ReportLocationType type);
|
|
};
|
|
|
|
struct ReportThread {
|
|
int id;
|
|
tid_t os_id;
|
|
bool running;
|
|
bool workerthread;
|
|
char *name;
|
|
u32 parent_tid;
|
|
ReportStack *stack;
|
|
};
|
|
|
|
struct ReportMutex {
|
|
u64 id;
|
|
uptr addr;
|
|
bool destroyed;
|
|
ReportStack *stack;
|
|
};
|
|
|
|
class ReportDesc {
|
|
public:
|
|
ReportType typ;
|
|
uptr tag;
|
|
Vector<ReportStack*> stacks;
|
|
Vector<ReportMop*> mops;
|
|
Vector<ReportLocation*> locs;
|
|
Vector<ReportMutex*> mutexes;
|
|
Vector<ReportThread*> threads;
|
|
Vector<int> unique_tids;
|
|
ReportStack *sleep;
|
|
int count;
|
|
|
|
ReportDesc();
|
|
~ReportDesc();
|
|
|
|
private:
|
|
ReportDesc(const ReportDesc&);
|
|
void operator = (const ReportDesc&);
|
|
};
|
|
|
|
// Format and output the report to the console/log. No additional logic.
|
|
void PrintReport(const ReportDesc *rep);
|
|
void PrintStack(const ReportStack *stack);
|
|
|
|
} // namespace __tsan
|
|
|
|
#endif // TSAN_REPORT_H
|