From bef89c910dc40f7e82ee56c3c8e8fdaa0cd5562b Mon Sep 17 00:00:00 2001 From: Mathieu Chartier Date: Fri, 9 Jan 2015 09:46:49 -0800 Subject: [PATCH] Fix HandleScope with wrong thread error Possibly fixes +art F 5127 6995 art/runtime/handle_scope-inl.h:43] Check failed: top_handle_scope == this (top_handle_scope=0x2b449293c770, this=0x2b4492d6a0a8) Seen in tests. A possible cause was that the thread dumping stacks was running checkpoints on a suspended thread but putting a HandleScope on that thread instead of itself. This isn't safe if the suspended thread is doing HandleScope stuff in a non runnable state. Change-Id: Icdaadabca5aff8d380d5cc9570b9e899fe790a62 --- runtime/handle_scope-inl.h | 1 + runtime/thread.cc | 5 +++-- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/runtime/handle_scope-inl.h b/runtime/handle_scope-inl.h index 421a413fb..222083b39 100644 --- a/runtime/handle_scope-inl.h +++ b/runtime/handle_scope-inl.h @@ -28,6 +28,7 @@ namespace art { template inline StackHandleScope::StackHandleScope(Thread* self, mirror::Object* fill_value) : HandleScope(self->GetTopHandleScope(), kNumReferences), self_(self), pos_(0) { + DCHECK_EQ(self, Thread::Current()); static_assert(kNumReferences >= 1, "StackHandleScope must contain at least 1 reference"); // TODO: Figure out how to use a compile assert. CHECK_EQ(&storage_[0], GetReferences()); diff --git a/runtime/thread.cc b/runtime/thread.cc index d2d5be7c1..527d758ab 100644 --- a/runtime/thread.cc +++ b/runtime/thread.cc @@ -982,8 +982,9 @@ static bool ShouldShowNativeStack(const Thread* thread) void Thread::DumpJavaStack(std::ostream& os) const { // Dumping the Java stack involves the verifier for locks. The verifier operates under the // assumption that there is no exception pending on entry. Thus, stash any pending exception. - // TODO: Find a way to avoid const_cast. - StackHandleScope<3> scope(const_cast(this)); + // Thread::Current() instead of this in case a thread is dumping the stack of another suspended + // thread. + StackHandleScope<3> scope(Thread::Current()); Handle exc; Handle throw_location_this_object; Handle throw_location_method; -- 2.11.0