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
99 lines
4.1 KiB
C++
99 lines
4.1 KiB
C++
//===-- tsan_interface_java.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.
|
|
//
|
|
// Interface for verification of Java or mixed Java/C++ programs.
|
|
// The interface is intended to be used from within a JVM and notify TSan
|
|
// about such events like Java locks and GC memory compaction.
|
|
//
|
|
// For plain memory accesses and function entry/exit a JVM is intended to use
|
|
// C++ interfaces: __tsan_readN/writeN and __tsan_func_enter/exit.
|
|
//
|
|
// For volatile memory accesses and atomic operations JVM is intended to use
|
|
// standard atomics API: __tsan_atomicN_load/store/etc.
|
|
//
|
|
// For usage examples see lit_tests/java_*.cc
|
|
//===----------------------------------------------------------------------===//
|
|
#ifndef TSAN_INTERFACE_JAVA_H
|
|
#define TSAN_INTERFACE_JAVA_H
|
|
|
|
#ifndef INTERFACE_ATTRIBUTE
|
|
# define INTERFACE_ATTRIBUTE __attribute__((visibility("default")))
|
|
#endif
|
|
|
|
#ifdef __cplusplus
|
|
extern "C" {
|
|
#endif
|
|
|
|
typedef unsigned long jptr; // NOLINT
|
|
|
|
// Must be called before any other callback from Java.
|
|
void __tsan_java_init(jptr heap_begin, jptr heap_size) INTERFACE_ATTRIBUTE;
|
|
// Must be called when the application exits.
|
|
// Not necessary the last callback (concurrently running threads are OK).
|
|
// Returns exit status or 0 if tsan does not want to override it.
|
|
int __tsan_java_fini() INTERFACE_ATTRIBUTE;
|
|
|
|
// Callback for memory allocations.
|
|
// May be omitted for allocations that are not subject to data races
|
|
// nor contain synchronization objects (e.g. String).
|
|
void __tsan_java_alloc(jptr ptr, jptr size) INTERFACE_ATTRIBUTE;
|
|
// Callback for memory free.
|
|
// Can be aggregated for several objects (preferably).
|
|
void __tsan_java_free(jptr ptr, jptr size) INTERFACE_ATTRIBUTE;
|
|
// Callback for memory move by GC.
|
|
// Can be aggregated for several objects (preferably).
|
|
// The ranges can overlap.
|
|
void __tsan_java_move(jptr src, jptr dst, jptr size) INTERFACE_ATTRIBUTE;
|
|
// This function must be called on the finalizer thread
|
|
// before executing a batch of finalizers.
|
|
// It ensures necessary synchronization between
|
|
// java object creation and finalization.
|
|
void __tsan_java_finalize() INTERFACE_ATTRIBUTE;
|
|
// Finds the first allocated memory block in the [*from_ptr, to) range, saves
|
|
// its address in *from_ptr and returns its size. Returns 0 if there are no
|
|
// allocated memory blocks in the range.
|
|
jptr __tsan_java_find(jptr *from_ptr, jptr to) INTERFACE_ATTRIBUTE;
|
|
|
|
// Mutex lock.
|
|
// Addr is any unique address associated with the mutex.
|
|
// Can be called on recursive reentry.
|
|
void __tsan_java_mutex_lock(jptr addr) INTERFACE_ATTRIBUTE;
|
|
// Mutex unlock.
|
|
void __tsan_java_mutex_unlock(jptr addr) INTERFACE_ATTRIBUTE;
|
|
// Mutex read lock.
|
|
void __tsan_java_mutex_read_lock(jptr addr) INTERFACE_ATTRIBUTE;
|
|
// Mutex read unlock.
|
|
void __tsan_java_mutex_read_unlock(jptr addr) INTERFACE_ATTRIBUTE;
|
|
// Recursive mutex lock, intended for handling of Object.wait().
|
|
// The 'rec' value must be obtained from the previous
|
|
// __tsan_java_mutex_unlock_rec().
|
|
void __tsan_java_mutex_lock_rec(jptr addr, int rec) INTERFACE_ATTRIBUTE;
|
|
// Recursive mutex unlock, intended for handling of Object.wait().
|
|
// The return value says how many times this thread called lock()
|
|
// w/o a pairing unlock() (i.e. how many recursive levels it unlocked).
|
|
// It must be passed back to __tsan_java_mutex_lock_rec() to restore
|
|
// the same recursion level.
|
|
int __tsan_java_mutex_unlock_rec(jptr addr) INTERFACE_ATTRIBUTE;
|
|
|
|
// Raw acquire/release primitives.
|
|
// Can be used to establish happens-before edges on volatile/final fields,
|
|
// in atomic operations, etc. release_store is the same as release, but it
|
|
// breaks release sequence on addr (see C++ standard 1.10/7 for details).
|
|
void __tsan_java_acquire(jptr addr) INTERFACE_ATTRIBUTE;
|
|
void __tsan_java_release(jptr addr) INTERFACE_ATTRIBUTE;
|
|
void __tsan_java_release_store(jptr addr) INTERFACE_ATTRIBUTE;
|
|
|
|
#ifdef __cplusplus
|
|
} // extern "C"
|
|
#endif
|
|
|
|
#undef INTERFACE_ATTRIBUTE
|
|
|
|
#endif // #ifndef TSAN_INTERFACE_JAVA_H
|