Merge "Ensure that we don't suspend during GetOwnedMonitorInfoCommon" into pi-dev

1 files changed, 3 insertions, 1 deletions

diff --git a/openjdkjvmti/ti_stack.cc b/openjdkjvmti/ti_stack.cc
index 41a649b5e3..4526be4cbe 100644
--- a/openjdkjvmti/ti_stack.cc
+++ b/openjdkjvmti/ti_stack.cc
@@ -925,7 +925,9 @@ static jvmtiError GetOwnedMonitorInfoCommon(const art::ScopedObjectAccessAlready
     if (target != self) {
       called_method = true;
       // RequestSynchronousCheckpoint releases the thread_list_lock_ as a part of its execution.
-      if (!target->RequestSynchronousCheckpoint(&closure)) {
+      // Since this deals with object references we need to avoid going to sleep.
+      art::ScopedAssertNoThreadSuspension sants("Getting owned monitor usage");
+      if (!target->RequestSynchronousCheckpoint(&closure, art::ThreadState::kRunnable)) {
         return ERR(THREAD_NOT_ALIVE);
       }
     } else {