commit ffc8cad04135192a8d10e7f38bd97c48101294a8
author Nicolas Geoffray <ngeoffray@google.com> Fri Feb 10 10:59:22 2017 +0000
committer Nicolas Geoffray <ngeoffray@google.com> Tue Feb 14 15:42:29 2017 +0000
tree fb90432ea5e6d218891c0b3fcccc0fa77d202f7d
parent 4e4b62e21672dbacf5d5abb688a126aabad29269

Add a DCHECK in thread::GetPeer.

Motivated  by https://android-review.googlesource.com/#/c/333205/.

Test: test-art-host run-jdwp-test.sh
Change-Id: I173c060324aa0dc39144db55e3a97e672c012ba8

runtime/openjdkjvmti/ti_stack.cc

diff --git a/runtime/openjdkjvmti/ti_stack.cc b/runtime/openjdkjvmti/ti_stack.cc
index b5a6c6e..067c7c1 100644
--- a/runtime/openjdkjvmti/ti_stack.cc
+++ b/runtime/openjdkjvmti/ti_stack.cc
@@ -328,7 +328,7 @@
 
     // For the time being, set the thread to null. We don't have good ScopedLocalRef
     // infrastructure.
-    DCHECK(self->GetPeer() != nullptr);
+    DCHECK(self->GetPeerFromOtherThread() != nullptr);
     stack_info.thread = nullptr;
     stack_info.state = JVMTI_THREAD_STATE_SUSPENDED;
 
@@ -495,7 +495,7 @@
 
     // For the time being, set the thread to null. We don't have good ScopedLocalRef
     // infrastructure.
-    DCHECK(self->GetPeer() != nullptr);
+    DCHECK(self->GetPeerFromOtherThread() != nullptr);
     stack_info.thread = nullptr;
     stack_info.state = JVMTI_THREAD_STATE_SUSPENDED;