2019-08-14 10:47:11 +02:00
|
|
|
//===-- tsan_interface_java.cpp -------------------------------------------===//
|
2013-01-10 13:44:08 +01:00
|
|
|
//
|
2019-08-14 10:47:11 +02:00
|
|
|
// Part of the LLVM Project, under the Apache License v2.0 with LLVM Exceptions.
|
|
|
|
// See https://llvm.org/LICENSE.txt for license information.
|
|
|
|
// SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception
|
2013-01-10 13:44:08 +01:00
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
//
|
|
|
|
// This file is a part of ThreadSanitizer (TSan), a race detector.
|
|
|
|
//
|
|
|
|
//===----------------------------------------------------------------------===//
|
|
|
|
|
|
|
|
#include "tsan_interface_java.h"
|
|
|
|
#include "tsan_rtl.h"
|
|
|
|
#include "tsan_mutex.h"
|
|
|
|
#include "sanitizer_common/sanitizer_internal_defs.h"
|
|
|
|
#include "sanitizer_common/sanitizer_common.h"
|
|
|
|
#include "sanitizer_common/sanitizer_placement_new.h"
|
2013-11-04 22:33:31 +01:00
|
|
|
#include "sanitizer_common/sanitizer_stacktrace.h"
|
|
|
|
#include "sanitizer_common/sanitizer_procmaps.h"
|
2013-01-10 13:44:08 +01:00
|
|
|
|
2019-11-05 14:54:57 +01:00
|
|
|
using namespace __tsan;
|
2013-01-10 13:44:08 +01:00
|
|
|
|
2014-09-23 19:59:53 +02:00
|
|
|
const jptr kHeapAlignment = 8;
|
2013-01-10 13:44:08 +01:00
|
|
|
|
2014-09-23 19:59:53 +02:00
|
|
|
namespace __tsan {
|
2013-01-10 13:44:08 +01:00
|
|
|
|
|
|
|
struct JavaContext {
|
|
|
|
const uptr heap_begin;
|
|
|
|
const uptr heap_size;
|
|
|
|
|
|
|
|
JavaContext(jptr heap_begin, jptr heap_size)
|
|
|
|
: heap_begin(heap_begin)
|
|
|
|
, heap_size(heap_size) {
|
|
|
|
}
|
|
|
|
};
|
|
|
|
|
|
|
|
class ScopedJavaFunc {
|
|
|
|
public:
|
|
|
|
ScopedJavaFunc(ThreadState *thr, uptr pc)
|
|
|
|
: thr_(thr) {
|
|
|
|
Initialize(thr_);
|
|
|
|
FuncEntry(thr, pc);
|
|
|
|
}
|
|
|
|
|
|
|
|
~ScopedJavaFunc() {
|
|
|
|
FuncExit(thr_);
|
|
|
|
// FIXME(dvyukov): process pending signals.
|
|
|
|
}
|
|
|
|
|
|
|
|
private:
|
|
|
|
ThreadState *thr_;
|
|
|
|
};
|
|
|
|
|
|
|
|
static u64 jctx_buf[sizeof(JavaContext) / sizeof(u64) + 1];
|
|
|
|
static JavaContext *jctx;
|
|
|
|
|
2013-02-13 11:46:01 +01:00
|
|
|
} // namespace __tsan
|
2013-01-10 13:44:08 +01:00
|
|
|
|
|
|
|
#define SCOPED_JAVA_FUNC(func) \
|
|
|
|
ThreadState *thr = cur_thread(); \
|
|
|
|
const uptr caller_pc = GET_CALLER_PC(); \
|
2014-11-13 21:41:38 +01:00
|
|
|
const uptr pc = StackTrace::GetCurrentPc(); \
|
2013-01-10 13:44:08 +01:00
|
|
|
(void)pc; \
|
|
|
|
ScopedJavaFunc scoped(thr, caller_pc); \
|
|
|
|
/**/
|
|
|
|
|
|
|
|
void __tsan_java_init(jptr heap_begin, jptr heap_size) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_init);
|
|
|
|
DPrintf("#%d: java_init(%p, %p)\n", thr->tid, heap_begin, heap_size);
|
|
|
|
CHECK_EQ(jctx, 0);
|
|
|
|
CHECK_GT(heap_begin, 0);
|
|
|
|
CHECK_GT(heap_size, 0);
|
|
|
|
CHECK_EQ(heap_begin % kHeapAlignment, 0);
|
|
|
|
CHECK_EQ(heap_size % kHeapAlignment, 0);
|
|
|
|
CHECK_LT(heap_begin, heap_begin + heap_size);
|
|
|
|
jctx = new(jctx_buf) JavaContext(heap_begin, heap_size);
|
|
|
|
}
|
|
|
|
|
|
|
|
int __tsan_java_fini() {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_fini);
|
|
|
|
DPrintf("#%d: java_fini()\n", thr->tid);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
// FIXME(dvyukov): this does not call atexit() callbacks.
|
|
|
|
int status = Finalize(thr);
|
|
|
|
DPrintf("#%d: java_fini() = %d\n", thr->tid, status);
|
|
|
|
return status;
|
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_alloc(jptr ptr, jptr size) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_alloc);
|
|
|
|
DPrintf("#%d: java_alloc(%p, %p)\n", thr->tid, ptr, size);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_NE(size, 0);
|
|
|
|
CHECK_EQ(ptr % kHeapAlignment, 0);
|
|
|
|
CHECK_EQ(size % kHeapAlignment, 0);
|
|
|
|
CHECK_GE(ptr, jctx->heap_begin);
|
|
|
|
CHECK_LE(ptr + size, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
2014-09-23 19:59:53 +02:00
|
|
|
OnUserAlloc(thr, pc, ptr, size, false);
|
2013-01-10 13:44:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_free(jptr ptr, jptr size) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_free);
|
|
|
|
DPrintf("#%d: java_free(%p, %p)\n", thr->tid, ptr, size);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_NE(size, 0);
|
|
|
|
CHECK_EQ(ptr % kHeapAlignment, 0);
|
|
|
|
CHECK_EQ(size % kHeapAlignment, 0);
|
|
|
|
CHECK_GE(ptr, jctx->heap_begin);
|
|
|
|
CHECK_LE(ptr + size, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
2016-11-08 23:04:09 +01:00
|
|
|
ctx->metamap.FreeRange(thr->proc(), ptr, size);
|
2013-01-10 13:44:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_move(jptr src, jptr dst, jptr size) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_move);
|
|
|
|
DPrintf("#%d: java_move(%p, %p, %p)\n", thr->tid, src, dst, size);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_NE(size, 0);
|
|
|
|
CHECK_EQ(src % kHeapAlignment, 0);
|
|
|
|
CHECK_EQ(dst % kHeapAlignment, 0);
|
|
|
|
CHECK_EQ(size % kHeapAlignment, 0);
|
|
|
|
CHECK_GE(src, jctx->heap_begin);
|
|
|
|
CHECK_LE(src + size, jctx->heap_begin + jctx->heap_size);
|
|
|
|
CHECK_GE(dst, jctx->heap_begin);
|
|
|
|
CHECK_LE(dst + size, jctx->heap_begin + jctx->heap_size);
|
2014-09-23 19:59:53 +02:00
|
|
|
CHECK_NE(dst, src);
|
|
|
|
CHECK_NE(size, 0);
|
2013-01-10 13:44:08 +01:00
|
|
|
|
|
|
|
// Assuming it's not running concurrently with threads that do
|
|
|
|
// memory accesses and mutex operations (stop-the-world phase).
|
2014-09-23 19:59:53 +02:00
|
|
|
ctx->metamap.MoveMemory(src, dst, size);
|
|
|
|
|
|
|
|
// Move shadow.
|
|
|
|
u64 *s = (u64*)MemToShadow(src);
|
|
|
|
u64 *d = (u64*)MemToShadow(dst);
|
|
|
|
u64 *send = (u64*)MemToShadow(src + size);
|
|
|
|
uptr inc = 1;
|
|
|
|
if (dst > src) {
|
|
|
|
s = (u64*)MemToShadow(src + size) - 1;
|
|
|
|
d = (u64*)MemToShadow(dst + size) - 1;
|
|
|
|
send = (u64*)MemToShadow(src) - 1;
|
|
|
|
inc = -1;
|
2013-01-10 13:44:08 +01:00
|
|
|
}
|
2014-09-23 19:59:53 +02:00
|
|
|
for (; s != send; s += inc, d += inc) {
|
|
|
|
*d = *s;
|
|
|
|
*s = 0;
|
2013-01-10 13:44:08 +01:00
|
|
|
}
|
|
|
|
}
|
|
|
|
|
ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins...
* 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
2017-10-19 13:23:59 +02:00
|
|
|
jptr __tsan_java_find(jptr *from_ptr, jptr to) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_find);
|
|
|
|
DPrintf("#%d: java_find(&%p, %p)\n", *from_ptr, to);
|
|
|
|
CHECK_EQ((*from_ptr) % kHeapAlignment, 0);
|
|
|
|
CHECK_EQ(to % kHeapAlignment, 0);
|
|
|
|
CHECK_GE(*from_ptr, jctx->heap_begin);
|
|
|
|
CHECK_LE(to, jctx->heap_begin + jctx->heap_size);
|
|
|
|
for (uptr from = *from_ptr; from < to; from += kHeapAlignment) {
|
|
|
|
MBlock *b = ctx->metamap.GetBlock(from);
|
|
|
|
if (b) {
|
|
|
|
*from_ptr = from;
|
|
|
|
return b->siz;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
return 0;
|
|
|
|
}
|
|
|
|
|
2014-09-23 19:59:53 +02:00
|
|
|
void __tsan_java_finalize() {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_finalize);
|
|
|
|
DPrintf("#%d: java_mutex_finalize()\n", thr->tid);
|
|
|
|
AcquireGlobal(thr, 0);
|
|
|
|
}
|
|
|
|
|
2013-01-10 13:44:08 +01:00
|
|
|
void __tsan_java_mutex_lock(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_mutex_lock);
|
|
|
|
DPrintf("#%d: java_mutex_lock(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins...
* 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
2017-10-19 13:23:59 +02:00
|
|
|
MutexPostLock(thr, pc, addr, MutexFlagLinkerInit | MutexFlagWriteReentrant |
|
|
|
|
MutexFlagDoPreLockOnPostLock);
|
2013-01-10 13:44:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_mutex_unlock(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_mutex_unlock);
|
|
|
|
DPrintf("#%d: java_mutex_unlock(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
|
|
|
MutexUnlock(thr, pc, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_mutex_read_lock(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_mutex_read_lock);
|
|
|
|
DPrintf("#%d: java_mutex_read_lock(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins...
* 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
2017-10-19 13:23:59 +02:00
|
|
|
MutexPostReadLock(thr, pc, addr, MutexFlagLinkerInit |
|
|
|
|
MutexFlagWriteReentrant | MutexFlagDoPreLockOnPostLock);
|
2013-01-10 13:44:08 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_mutex_read_unlock(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_mutex_read_unlock);
|
|
|
|
DPrintf("#%d: java_mutex_read_unlock(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
|
|
|
MutexReadUnlock(thr, pc, addr);
|
|
|
|
}
|
2013-11-04 22:33:31 +01:00
|
|
|
|
|
|
|
void __tsan_java_mutex_lock_rec(jptr addr, int rec) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_mutex_lock_rec);
|
|
|
|
DPrintf("#%d: java_mutex_lock_rec(%p, %d)\n", thr->tid, addr, rec);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
CHECK_GT(rec, 0);
|
|
|
|
|
ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins...
* 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
2017-10-19 13:23:59 +02:00
|
|
|
MutexPostLock(thr, pc, addr, MutexFlagLinkerInit | MutexFlagWriteReentrant |
|
|
|
|
MutexFlagDoPreLockOnPostLock | MutexFlagRecursiveLock, rec);
|
2013-11-04 22:33:31 +01:00
|
|
|
}
|
|
|
|
|
|
|
|
int __tsan_java_mutex_unlock_rec(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_mutex_unlock_rec);
|
|
|
|
DPrintf("#%d: java_mutex_unlock_rec(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
ubsan.c (ubsan_expand_null_ifn): Use _v1 suffixed type mismatch builtins...
* 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
2017-10-19 13:23:59 +02:00
|
|
|
return MutexUnlock(thr, pc, addr, MutexFlagRecursiveUnlock);
|
2013-11-04 22:33:31 +01:00
|
|
|
}
|
2015-10-21 09:32:45 +02:00
|
|
|
|
|
|
|
void __tsan_java_acquire(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_acquire);
|
|
|
|
DPrintf("#%d: java_acquire(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
|
|
|
Acquire(thr, caller_pc, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_release(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_release);
|
|
|
|
DPrintf("#%d: java_release(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
|
|
|
Release(thr, caller_pc, addr);
|
|
|
|
}
|
|
|
|
|
|
|
|
void __tsan_java_release_store(jptr addr) {
|
|
|
|
SCOPED_JAVA_FUNC(__tsan_java_release);
|
|
|
|
DPrintf("#%d: java_release_store(%p)\n", thr->tid, addr);
|
|
|
|
CHECK_NE(jctx, 0);
|
|
|
|
CHECK_GE(addr, jctx->heap_begin);
|
|
|
|
CHECK_LT(addr, jctx->heap_begin + jctx->heap_size);
|
|
|
|
|
|
|
|
ReleaseStore(thr, caller_pc, addr);
|
|
|
|
}
|