summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--src/thread.cc4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/thread.cc b/src/thread.cc
index 10b099d48a..64f618c9ee 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1594,8 +1594,8 @@ Method* Thread::GetCurrentMethod(uintptr_t* pc, Method*** sp) const {
#else
Method* Thread::GetCurrentMethod(uintptr_t*, Method***) const {
ShadowFrame* frame = top_shadow_frame_;
- while (frame->GetMethod()->IsNative()) {
- frame = frame->GetLink();
+ if (frame == NULL) {
+ return NULL;
}
return frame->GetMethod();
}