From 77ebf6842fa97642d17673fbdadbcad1875dd3cb Mon Sep 17 00:00:00 2001
From: Ben Gruver <bgruv@google.com>
Date: Sun, 7 Apr 2013 20:26:33 -0700
Subject: [PATCH] Add codeAddress field to AnalysisException

---
 .../main/java/org/jf/dexlib2/analysis/AnalysisException.java    | 2 ++
 .../src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java   | 1 +
 2 files changed, 3 insertions(+)

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/analysis/AnalysisException.java b/dexlib2/src/main/java/org/jf/dexlib2/analysis/AnalysisException.java
index 673557eb..4ca7b138 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/analysis/AnalysisException.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/analysis/AnalysisException.java
@@ -34,6 +34,8 @@ package org.jf.dexlib2.analysis;
 import org.jf.util.ExceptionWithContext;
 
 public class AnalysisException extends ExceptionWithContext {
+    public int codeAddress;
+
     public AnalysisException(Throwable cause) {
         super(cause);
     }
diff --git a/dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java b/dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java
index 5afcd01a..248488e6 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/analysis/MethodAnalyzer.java
@@ -202,6 +202,7 @@ public class MethodAnalyzer {
                     } catch (AnalysisException ex) {
                         this.analysisException = ex;
                         int codeAddress = getInstructionAddress(instructionToAnalyze);
+                        ex.codeAddress = codeAddress;
                         ex.addContext(String.format("opcode: %s", instructionToAnalyze.instruction.getOpcode().name));
                         ex.addContext(String.format("code address: %d", codeAddress));
                         ex.addContext(String.format("method: %s", ReferenceUtil.getReferenceString(method)));