commit 26c935a46a26dc5af285dd168f4282e1d96d4ad3
author Brian Carlstrom <bdc@google.com> Sun Oct 16 14:52:35 2011 -0700
committer Brian Carlstrom <bdc@google.com> Sun Oct 16 14:52:35 2011 -0700
tree 6542ebfb57e9d81b1568614992c5e489719ce02c
parent 0aa85802e37a9f5b8c1d3f36e015fabe7039feca

Make Method::ToDexPC tolerate callee save methods

Change-Id: I266db0d8505e909390f62151b7b7705bf68bc01c

src/object.cc

diff --git a/src/object.cc b/src/object.cc
index 81c646e..558978c 100644
--- a/src/object.cc
+++ b/src/object.cc
@@ -588,7 +588,7 @@
 uint32_t Method::ToDexPC(const uintptr_t pc) const {
   const uint32_t* mapping_table = GetMappingTable();
   if (mapping_table == NULL) {
-    DCHECK(IsNative()) << PrettyMethod(this);
+    DCHECK(IsNative() || IsCalleeSaveMethod()) << PrettyMethod(this);
     return DexFile::kDexNoIndex;   // Special no mapping case
   }
   size_t mapping_table_length = GetMappingTableLength();