commit 5a900e22e068b8e6bb3dd6e9f65d198b5bd5d566
author Ben Gruver <bgruv@google.com> Sun Feb 02 20:06:55 2020 -0800
committer Ben Gruver <bgruv@google.com> Sun Feb 02 20:06:55 2020 -0800
tree 406bdb7f001aa5d0e01a11817d821efc3a23ba2b
parent 49f7e265078c5bb45e214ab6f869f7993b26322f

Use reference type from wrapped instruction in BaseRewrittenReferenceInstruction

Otherwise, the reference won't be rewritten correctly if the overriding
class overrides getReferenceType to return a different type.

dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java

diff --git a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java b/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java
index c7da8ca..92d94be 100644
--- a/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java
+++ b/dexlib2/src/main/java/org/jf/dexlib2/rewriter/InstructionRewriter.java
@@ -81,7 +81,7 @@
         }
 
         @Override @Nonnull public Reference getReference() {
-            switch (getReferenceType()) {
+            switch (instruction.getReferenceType()) {
                 case ReferenceType.TYPE:
                     return RewriterUtils.rewriteTypeReference(rewriters.getTypeRewriter(),
                             (TypeReference)instruction.getReference());