commit d9aff1372e6a2f573b14d124f3d6f5305bdc6080
author Alex Light <allight@google.com> Tue Oct 31 22:30:05 2017 +0000
committer Alex Light <allight@google.com> Wed Nov 01 18:49:04 2017 +0000
tree 2e0eaeb39c909167ecb5190b51f908e3622940cd
parent df00a1ed1a0b633a1e66f1f650f53c22ea260e5b

Revert "Revert "Prevent races with GC when transferring objects between threads""

This reverts commit e5179ce0ca8becf34ba6e7b2f3988874fe647c26.

Reason for revert: Fixed issues with:
  Checkpoint flag set without pending checkpoint in parent CL.

Bug: 67838964
Test: ./test.py --host -j50

Change-Id: I7622f9c18866b58ee3cbd9f4fe38a29b2cf84a88

openjdkjvmti/ti_method.cc

diff --git a/openjdkjvmti/ti_method.cc b/openjdkjvmti/ti_method.cc
index 5d63285..cf93bf0 100644
--- a/openjdkjvmti/ti_method.cc
+++ b/openjdkjvmti/ti_method.cc
@@ -771,7 +771,7 @@
   }
   GetLocalVariableClosure c(self, depth, slot, type, val);
   // RequestSynchronousCheckpoint releases the thread_list_lock_ as a part of its execution.
-  if (!target->RequestSynchronousCheckpoint(&c)) {
+  if (!ThreadUtil::RequestGCSafeSynchronousCheckpoint(target, &c)) {
     return ERR(THREAD_NOT_ALIVE);
   } else {
     return c.GetResult();
@@ -900,7 +900,7 @@
   }
   SetLocalVariableClosure c(self, depth, slot, type, val);
   // RequestSynchronousCheckpoint releases the thread_list_lock_ as a part of its execution.
-  if (!target->RequestSynchronousCheckpoint(&c)) {
+  if (!ThreadUtil::RequestGCSafeSynchronousCheckpoint(target, &c)) {
     return ERR(THREAD_NOT_ALIVE);
   } else {
     return c.GetResult();
@@ -959,7 +959,7 @@
   }
   GetLocalInstanceClosure c(self, depth, data);
   // RequestSynchronousCheckpoint releases the thread_list_lock_ as a part of its execution.
-  if (!target->RequestSynchronousCheckpoint(&c)) {
+  if (!ThreadUtil::RequestGCSafeSynchronousCheckpoint(target, &c)) {
     return ERR(THREAD_NOT_ALIVE);
   } else {
     return c.GetResult();