[llvm-commits] [compiler-rt] r170882 - /compiler-rt/trunk/lib/tsan/rtl/tsan_interface_java.cc
Dmitry Vyukov
dvyukov at google.com
Fri Dec 21 03:16:40 PST 2012
Author: dvyukov
Date: Fri Dec 21 05:16:40 2012
New Revision: 170882
URL: http://llvm.org/viewvc/llvm-project?rev=170882&view=rev
Log:
tsan: java: move shadow memory on GC compaction
Modified:
compiler-rt/trunk/lib/tsan/rtl/tsan_interface_java.cc
Modified: compiler-rt/trunk/lib/tsan/rtl/tsan_interface_java.cc
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/lib/tsan/rtl/tsan_interface_java.cc?rev=170882&r1=170881&r2=170882&view=diff
==============================================================================
--- compiler-rt/trunk/lib/tsan/rtl/tsan_interface_java.cc (original)
+++ compiler-rt/trunk/lib/tsan/rtl/tsan_interface_java.cc Fri Dec 21 05:16:40 2012
@@ -166,6 +166,8 @@
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);
}
@@ -185,6 +187,8 @@
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);
@@ -197,6 +201,8 @@
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);
@@ -213,6 +219,9 @@
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);
@@ -221,13 +230,25 @@
// Assuming it's not running concurrently with threads that do
// memory accesses and mutex operations (stop-the-world phase).
- BlockDesc *srcbeg = getblock(src);
- BlockDesc *dstbeg = getblock(dst);
- BlockDesc *srcend = getblock(src + size);
- for (BlockDesc *s = srcbeg, *d = dstbeg; s != srcend; s++, d++) {
- if (s->begin) {
- new(d) BlockDesc(s);
- s->~BlockDesc();
+ { // NOLINT
+ BlockDesc *s = getblock(src);
+ BlockDesc *d = getblock(dst);
+ BlockDesc *send = getblock(src + size);
+ for (; s != send; s++, d++) {
+ if (s->begin) {
+ new(d) BlockDesc(s);
+ s->~BlockDesc();
+ }
+ }
+ }
+
+ { // NOLINT
+ u64 *s = (u64*)MemToShadow(src);
+ u64 *d = (u64*)MemToShadow(dst);
+ u64 *send = (u64*)MemToShadow(src + size);
+ for (; s != send; s++, d++) {
+ *d = *s;
+ *s = 0;
}
}
}
More information about the llvm-commits
mailing list