tsan: fix Java heap block begin in reports

[dvyukov]

Summary

We currently use a wrong value for heap block
(only works for C++, but not for Java).
Use the correct value (we already computed it before, just forgot to use).

Depends on D114593.

compiler-rt/lib/tsan/rtl/tsan_rtl_report.cpp

if (block_begin)
       b = ctx->metamap.GetBlock(block_begin);
   }
   if (!b)
     b = JavaHeapBlock(addr, &block_begin);
   if (b != 0) {
     ThreadContext *tctx = FindThreadByTidLocked(b->tid);
     auto *loc = New<ReportLocation>();
     loc->type = ReportLocationHeap;
-    loc->heap_chunk_start = (uptr)allocator()->GetBlockBegin((void *)addr);
+    loc->heap_chunk_start = block_begin;
     loc->heap_chunk_size = b->siz;
     loc->external_tag = b->tag;
     loc->tid = tctx ? tctx->tid : b->tid;
     loc->stack = SymbolizeStackId(b->stk);
     rep_->locs.PushBack(loc);
     if (tctx)
       AddThread(tctx);
     return;

compiler-rt/test/tsan/java_symbolization.cpp

 
 int main() {
   barrier_init(&barrier, 2);
   jptr jheap = (jptr)java_heap;
   __tsan_java_init(jheap, kHeapSize);
   const int kBlockSize = 32;
   __tsan_func_entry(3456 | kExternalPCBit);
   __tsan_java_alloc(jheap, kBlockSize);
+  print_address("addr:", 2, jheap, jheap + 16);
   __tsan_func_exit();
   pthread_t th;
   pthread_create(&th, 0, Thread, (void*)jheap);
   __tsan_func_entry(2345 | kExternalPCBit);
   __tsan_write1_pc(jheap + 16, 1234 | kExternalPCBit);
   __tsan_func_exit();
   barrier_wait(&barrier);
   pthread_join(th, 0);
   __tsan_java_free(jheap, kBlockSize);
   fprintf(stderr, "DONE\n");
   return __tsan_java_fini();
 }
 
+// CHECK: addr:[[BLOCK:0x[0-9,a-f]+]] [[ADDR:0x[0-9,a-f]+]]
 // CHECK: WARNING: ThreadSanitizer: data race
-// CHECK:   Write
+// CHECK:   Write of size 1 at [[ADDR]] by thread T1:
 // CHECK:     #0 MyInnerFunc MyInnerFile.java:1234:56
 // CHECK:     #1 MyOuterFunc MyOuterFile.java:4321:65
 // CHECK:     #2 Caller1 CallerFile.java:111:22
 // CHECK:     #3 Caller2 CallerFile.java:333:44
-// CHECK:   Previous write
+// CHECK:   Previous write of size 1 at [[ADDR]] by main thread:
 // CHECK:     #0 MyInnerFunc MyInnerFile.java:1234:56
 // CHECK:     #1 MyOuterFunc MyOuterFile.java:4321:65
 // CHECK:     #2 Caller1 CallerFile.java:111:22
 // CHECK:     #3 Caller2 CallerFile.java:333:44
-// CHECK:   Location is heap block of size 32 at {{.*}} allocated by main thread:
+// CHECK:   Location is heap block of size 32 at [[BLOCK]] allocated by main thread:
 // CHECK:     #0 Allocer1 Alloc.java:11:222
 // CHECK:     #1 Allocer2 Alloc.java:33:444
 // CHECK: DONE