commit 736df0253aa65ebccb29ddb6443c31b7730ca3e5
author Logan Chien <loganchien@google.com> Fri Apr 27 16:25:57 2012 +0800
committer Shih-wei Liao <sliao@google.com> Wed May 02 04:19:59 2012 -0700
tree 1cd9c391ab4400abdbc5a4c31c6789b3af0f286d
parent d8749cff01eb5d91ff770d8f75d853745903e781

Use try item offset to find catch block instead of Dex PC.

Change-Id: Icb8cd07a824be638c02a6204cfaf034a249d49b5

src/dex_file.h

diff --git a/src/dex_file.h b/src/dex_file.h
index 70c2059..aeb7e89 100644
--- a/src/dex_file.h
+++ b/src/dex_file.h
@@ -1128,6 +1128,10 @@
 class CatchHandlerIterator {
   public:
     CatchHandlerIterator(const DexFile::CodeItem& code_item, uint32_t address);
+
+    CatchHandlerIterator(const DexFile::CodeItem& code_item,
+                         const DexFile::TryItem& try_item);
+
     explicit CatchHandlerIterator(const byte* handler_data) {
       Init(handler_data);
     }
@@ -1148,6 +1152,7 @@
       return current_data_;
     }
   private:
+    void Init(const DexFile::CodeItem& code_item, int32_t offset);
     void Init(const byte* handler_data);
 
     struct CatchHandlerItem {