commit 20efe54063f2740d16f01190b280cdba384c869b
author TDYa127 <tdy@google.com> Tue Apr 03 17:40:49 2012 -0700
committer Shih-wei Liao <sliao@google.com> Tue Apr 03 23:27:29 2012 -0700
tree 271e06250a2f738901c632bdca91dd4d8dcc52eb
parent 64f884de66d0eb888a215e276f9b10ade0690413

Fix the GetCurrentMethod bug.

Change-Id: I1f28dd991ed209afe42d785887bc15344baa4526

src/thread.cc

diff --git a/src/thread.cc b/src/thread.cc
index 10b099d..64f618c 100644
--- a/src/thread.cc
+++ b/src/thread.cc
@@ -1594,8 +1594,8 @@
 #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();
 }