From d89375a663e52cb7a65b560bb04421370a2737f0 Mon Sep 17 00:00:00 2001 From: Ben Gruver Date: Tue, 20 Dec 2011 20:26:18 -0800 Subject: [PATCH] Fix-up InlineMethodResolver_version35 to use the new OdexedInvokeInline interface --- .../dexlib/Code/Analysis/InlineMethodResolver.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/InlineMethodResolver.java b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/InlineMethodResolver.java index 73fdde67..33835885 100644 --- a/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/InlineMethodResolver.java +++ b/dexlib/src/main/java/org/jf/dexlib/Code/Analysis/InlineMethodResolver.java @@ -76,15 +76,15 @@ public abstract class InlineMethodResolver { @Override public DeodexUtil.InlineMethod resolveExecuteInline(AnalyzedInstruction analyzedInstruction) { - assert analyzedInstruction.instruction instanceof OdexedInvokeVirtual; + assert analyzedInstruction.instruction instanceof OdexedInvokeInline; - OdexedInvokeVirtual instruction = (OdexedInvokeVirtual)analyzedInstruction.instruction; - int methodIndex = instruction.getVtableIndex(); + OdexedInvokeInline instruction = (OdexedInvokeInline)analyzedInstruction.instruction; + int inlineIndex = instruction.getInlineIndex(); - if (methodIndex < 0 || methodIndex >= inlineMethods.length) { - throw new RuntimeException("Invalid method index: " + methodIndex); + if (inlineIndex < 0 || inlineIndex >= inlineMethods.length) { + throw new RuntimeException("Invalid inline index: " + inlineIndex); } - return inlineMethods[methodIndex]; + return inlineMethods[inlineIndex]; } }