diff options
| author | Dmitry Vyukov <dvyukov@google.com> | 2014-07-08 20:01:12 +0000 |
|---|---|---|
| committer | Dmitry Vyukov <dvyukov@google.com> | 2014-07-08 20:01:12 +0000 |
| commit | 75e8a9117af00bc1ffe2a64c1a4232554fc506f4 (patch) | |
| tree | 2dca1af5fb87230fbd7e2c5d6577f5aa186904a6 /test/tsan/java_lock_move.cc | |
| parent | 54e0edaf51707800948263a1a929cfc64f6df285 (diff) | |
tsan: allow memory overlap in __tsan_java_move
JVM actually moves memory between overlapping ranges.
git-svn-id: https://llvm.org/svn/llvm-project/compiler-rt/trunk@212560 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/tsan/java_lock_move.cc')
| -rw-r--r-- | test/tsan/java_lock_move.cc | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/tsan/java_lock_move.cc b/test/tsan/java_lock_move.cc index 15a72c738..19c3e35d6 100644 --- a/test/tsan/java_lock_move.cc +++ b/test/tsan/java_lock_move.cc @@ -16,13 +16,13 @@ void *Thread(void *p) { int main() { int const kHeapSize = 1024 * 1024; - void *jheap = malloc(kHeapSize); - __tsan_java_init((jptr)jheap, kHeapSize); + jptr jheap = (jptr)malloc(kHeapSize + 8) + 8; + __tsan_java_init(jheap, kHeapSize); const int kBlockSize = 64; int const kMove = 1024; - __tsan_java_alloc((jptr)jheap, kBlockSize); - varaddr = (jptr)jheap; - lockaddr = (jptr)jheap + 46; + __tsan_java_alloc(jheap, kBlockSize); + varaddr = jheap; + lockaddr = jheap + 46; varaddr2 = varaddr + kMove; lockaddr2 = lockaddr + kMove; pthread_t th; @@ -33,8 +33,9 @@ int main() { __tsan_java_move(varaddr, varaddr2, kBlockSize); pthread_join(th, 0); __tsan_java_free(varaddr2, kBlockSize); - printf("OK\n"); + printf("DONE\n"); return __tsan_java_fini(); } // CHECK-NOT: WARNING: ThreadSanitizer: data race +// CHECK: DONE |