[compiler-rt] 0bc10d9 - tsan: restore Initialize call in Java entry points

[Dmitry Vyukov via llvm-commits]

Author: Dmitry Vyukov
Date: 2021-07-29T17:13:09+02:00
New Revision: 0bc10d9a8ed072c280ec07cd814671dae887a943

URL: https://github.com/llvm/llvm-project/commit/0bc10d9a8ed072c280ec07cd814671dae887a943
DIFF: https://github.com/llvm/llvm-project/commit/0bc10d9a8ed072c280ec07cd814671dae887a943.diff

LOG: tsan: restore Initialize call in Java entry points

We used to call Initialize in every Java point.
That was removed in 6563bb53b5 ("tsan: don't use caller/current PC in Java interfaces").
The intention was to add a single Initialize to __tsan_java_init instead.
Do that.

Reviewed By: melver

Differential Revision: https://reviews.llvm.org/D107069

Added: 
    

Modified: 
    compiler-rt/lib/tsan/rtl/tsan_interface_java.cpp

Removed: 
    


################################################################################
diff  --git a/compiler-rt/lib/tsan/rtl/tsan_interface_java.cpp b/compiler-rt/lib/tsan/rtl/tsan_interface_java.cpp
index 011230c89e13..270c1360b062 100644
--- a/compiler-rt/lib/tsan/rtl/tsan_interface_java.cpp
+++ b/compiler-rt/lib/tsan/rtl/tsan_interface_java.cpp
@@ -62,6 +62,7 @@ MBlock *JavaHeapBlock(uptr addr, uptr *start) {
 
 void __tsan_java_init(jptr heap_begin, jptr heap_size) {
   JAVA_FUNC_ENTER(__tsan_java_init);
+  Initialize(thr);
   DPrintf("#%d: java_init(%p, %p)\n", thr->tid, heap_begin, heap_size);
   CHECK_EQ(jctx, 0);
   CHECK_GT(heap_begin, 0);