commit 3e2e1a2380e7b2ce402640ea4f6a177c06bd19a2
author Elliott Hughes <enh@google.com> Tue Feb 21 11:33:41 2012 -0800
committer Elliott Hughes <enh@google.com> Tue Feb 21 11:33:41 2012 -0800
tree 270b4fc730431a0410f1094d919fe00ba9f6a1ad
parent c3a9571755f09f0b182818e6eb7294623df40974

Fix single-stepping for native methods.

Change-Id: I1a70c27272aacb79871407a05d4538056f381e25

src/debugger.cc

diff --git a/src/debugger.cc b/src/debugger.cc
index 61118eb..a456f23 100644
--- a/src/debugger.cc
+++ b/src/debugger.cc
@@ -1914,7 +1914,6 @@
     DebugCallbackContext() {
       last_pc_valid = false;
       last_pc = 0;
-      gSingleStepControl.dex_pcs.clear();
     }
 
     static bool Callback(void* raw_context, uint32_t address, uint32_t line_number) {
@@ -1950,11 +1949,16 @@
     bool last_pc_valid;
     uint32_t last_pc;
   };
-  DebugCallbackContext context;
+  gSingleStepControl.dex_pcs.clear();
   const Method* m = gSingleStepControl.method;
-  MethodHelper mh(m);
-  mh.GetDexFile().DecodeDebugInfo(mh.GetCodeItem(), m->IsStatic(), m->GetDexMethodIndex(),
-                                  DebugCallbackContext::Callback, NULL, &context);
+  if (m->IsNative()) {
+    gSingleStepControl.line_number = -1;
+  } else {
+    DebugCallbackContext context;
+    MethodHelper mh(m);
+    mh.GetDexFile().DecodeDebugInfo(mh.GetCodeItem(), m->IsStatic(), m->GetDexMethodIndex(),
+                                    DebugCallbackContext::Callback, NULL, &context);
+  }
 
   //
   // Everything else...