From f89b51c74e6f747ec21580d22ca17a66ed497eca Mon Sep 17 00:00:00 2001
From: Connor Tumbleson <connor.tumbleson@gmail.com>
Date: Fri, 15 Nov 2013 12:14:35 -0600
Subject: [PATCH] Update to smali 2.0.2

---
 brut.apktool.smali/build.gradle               |  2 +-
 .../builder/BuilderExceptionHandler.java      | 30 +++++++++++------
 .../dexlib2/builder/BuilderSwitchPayload.java |  4 +++
 .../jf/dexlib2/builder/BuilderTryBlock.java   |  7 ++--
 .../builder/MethodImplementationBuilder.java  |  3 +-
 .../jf/dexlib2/builder/MethodLocation.java    |  3 +-
 .../builder/MutableMethodImplementation.java  | 33 +++++++++++--------
 .../BuilderPackedSwitchPayload.java           | 19 ++++-------
 .../BuilderSparseSwitchPayload.java           |  5 ++-
 .../instruction/BuilderSwitchElement.java     |  5 +++
 .../dexlib2/dexbacked/DexBackedClassDef.java  | 33 ++++++++++---------
 .../jf/dexlib2/dexbacked/raw/HeaderItem.java  |  6 ++++
 .../immutable/debug/ImmutableStartLocal.java  |  2 +-
 .../java/org/jf/dexlib2/writer/DexWriter.java | 14 ++++----
 .../writer/builder/BuilderClassPool.java      | 10 +++---
 .../writer/builder/BuilderTypeListPool.java   |  4 +--
 .../org/jf/dexlib2/writer/pool/ClassPool.java | 10 +++---
 .../jf/dexlib2/writer/pool/TypeListPool.java  | 24 ++++++++++----
 18 files changed, 126 insertions(+), 88 deletions(-)

diff --git a/brut.apktool.smali/build.gradle b/brut.apktool.smali/build.gradle
index e6d738ed..0e8b19bf 100644
--- a/brut.apktool.smali/build.gradle
+++ b/brut.apktool.smali/build.gradle
@@ -31,7 +31,7 @@
 
 apply plugin: 'idea'
 
-version = '2.0'
+version = '2.0.2'
 
 def jarVersion = version
 
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderExceptionHandler.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderExceptionHandler.java
index 3574bd48..e7376df0 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderExceptionHandler.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderExceptionHandler.java
@@ -32,19 +32,29 @@
 package org.jf.dexlib2.builder;
 
 import org.jf.dexlib2.base.BaseExceptionHandler;
-import org.jf.dexlib2.iface.ExceptionHandler;
 import org.jf.dexlib2.iface.reference.TypeReference;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 
-class BuilderExceptionHandler {
-    static ExceptionHandler newExceptionHandler(@Nullable final TypeReference exceptionType,
-                                                @Nonnull final Label handler) {
+public abstract class BuilderExceptionHandler extends BaseExceptionHandler {
+    @Nonnull protected final Label handler;
+
+    private BuilderExceptionHandler(@Nonnull Label handler) {
+        this.handler = handler;
+    }
+
+    @Nonnull
+    public Label getHandler() {
+        return handler;
+    }
+
+    static BuilderExceptionHandler newExceptionHandler(@Nullable final TypeReference exceptionType,
+                                                @Nonnull Label handler) {
         if (exceptionType == null) {
             return newExceptionHandler(handler);
         }
-        return new BaseExceptionHandler() {
+        return new BuilderExceptionHandler(handler) {
             @Nullable @Override public String getExceptionType() {
                 return exceptionType.getType();
             }
@@ -59,8 +69,8 @@ class BuilderExceptionHandler {
         };
     }
 
-    static ExceptionHandler newExceptionHandler(@Nonnull final Label handler) {
-        return new BaseExceptionHandler() {
+    static BuilderExceptionHandler newExceptionHandler(@Nonnull Label handler) {
+        return new BuilderExceptionHandler(handler) {
             @Nullable @Override public String getExceptionType() {
                 return null;
             }
@@ -71,12 +81,12 @@ class BuilderExceptionHandler {
         };
     }
 
-    static ExceptionHandler newExceptionHandler(@Nullable final String exceptionType,
-                                                @Nonnull final Label handler) {
+    static BuilderExceptionHandler newExceptionHandler(@Nullable final String exceptionType,
+                                                @Nonnull Label handler) {
         if (exceptionType == null) {
             return newExceptionHandler(handler);
         }
-        return new BaseExceptionHandler() {
+        return new BuilderExceptionHandler(handler) {
             @Nullable @Override public String getExceptionType() {
                 return exceptionType;
             }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderSwitchPayload.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderSwitchPayload.java
index d760383e..2fd490bd 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderSwitchPayload.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderSwitchPayload.java
@@ -32,10 +32,12 @@
 package org.jf.dexlib2.builder;
 
 import org.jf.dexlib2.Opcode;
+import org.jf.dexlib2.builder.instruction.BuilderSwitchElement;
 import org.jf.dexlib2.iface.instruction.SwitchPayload;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
+import java.util.List;
 
 public abstract class BuilderSwitchPayload extends BuilderInstruction implements SwitchPayload {
     @Nullable
@@ -52,4 +54,6 @@ public abstract class BuilderSwitchPayload extends BuilderInstruction implements
         }
         return referrer;
     }
+
+    @Nonnull @Override public abstract List<? extends BuilderSwitchElement> getSwitchElements();
 }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderTryBlock.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderTryBlock.java
index f8e94cf0..f2387888 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderTryBlock.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/BuilderTryBlock.java
@@ -33,16 +33,15 @@ package org.jf.dexlib2.builder;
 
 import com.google.common.collect.ImmutableList;
 import org.jf.dexlib2.base.BaseTryBlock;
-import org.jf.dexlib2.iface.ExceptionHandler;
 import org.jf.dexlib2.iface.reference.TypeReference;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
 import java.util.List;
 
-class BuilderTryBlock extends BaseTryBlock<ExceptionHandler> {
+public class BuilderTryBlock extends BaseTryBlock<BuilderExceptionHandler> {
     // We only ever have one exception handler per try block. They are later merged as needed in TryListBuilder
-    @Nonnull public final ExceptionHandler exceptionHandler;
+    @Nonnull public final BuilderExceptionHandler exceptionHandler;
     @Nonnull public final Label start;
     // The end location is exclusive, it should point to the codeAddress of the instruction immediately after the last
     // covered instruction.
@@ -76,7 +75,7 @@ class BuilderTryBlock extends BaseTryBlock<ExceptionHandler> {
         return end.getCodeAddress() - start.getCodeAddress();
     }
 
-    @Nonnull @Override public List<? extends ExceptionHandler> getExceptionHandlers() {
+    @Nonnull @Override public List<? extends BuilderExceptionHandler> getExceptionHandlers() {
         return ImmutableList.of(exceptionHandler);
     }
 }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodImplementationBuilder.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodImplementationBuilder.java
index 4a1e989d..e830b655 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodImplementationBuilder.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodImplementationBuilder.java
@@ -34,7 +34,6 @@ package org.jf.dexlib2.builder;
 import org.jf.dexlib2.iface.MethodImplementation;
 import org.jf.dexlib2.iface.reference.StringReference;
 import org.jf.dexlib2.iface.reference.TypeReference;
-import org.jf.dexlib2.writer.builder.BuilderStringReference;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -143,7 +142,7 @@ public class MethodImplementationBuilder {
         currentLocation.addEpilogue();
     }
 
-    public void addSetSourceFile(@Nullable BuilderStringReference sourceFile) {
+    public void addSetSourceFile(@Nullable StringReference sourceFile) {
         currentLocation.addSetSourceFile(sourceFile);
     }
 
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodLocation.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodLocation.java
index 18daeeaa..f7c0effc 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodLocation.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MethodLocation.java
@@ -36,7 +36,6 @@ import org.jf.dexlib2.builder.debug.*;
 import org.jf.dexlib2.iface.instruction.Instruction;
 import org.jf.dexlib2.iface.reference.StringReference;
 import org.jf.dexlib2.iface.reference.TypeReference;
-import org.jf.dexlib2.writer.builder.BuilderStringReference;
 
 import javax.annotation.Nonnull;
 import javax.annotation.Nullable;
@@ -207,7 +206,7 @@ public class MethodLocation {
         getDebugItems().add(new BuilderEpilogueBegin());
     }
 
-    public void addSetSourceFile(@Nullable BuilderStringReference sourceFile) {
+    public void addSetSourceFile(@Nullable StringReference sourceFile) {
         getDebugItems().add(new BuilderSetSourceFile(sourceFile));
     }
 }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MutableMethodImplementation.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MutableMethodImplementation.java
index 006b7193..8cdf1f99 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MutableMethodImplementation.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/MutableMethodImplementation.java
@@ -136,13 +136,13 @@ public class MutableMethodImplementation implements MethodImplementation {
     }
 
     @Nonnull
-    public List<Instruction> getInstructions() {
+    public List<BuilderInstruction> getInstructions() {
         if (fixInstructions) {
             fixInstructions();
         }
 
-        return new AbstractList<Instruction>() {
-            @Override public Instruction get(int i) {
+        return new AbstractList<BuilderInstruction>() {
+            @Override public BuilderInstruction get(int i) {
                 if (i >= size()) {
                     throw new IndexOutOfBoundsException();
                 }
@@ -162,7 +162,7 @@ public class MutableMethodImplementation implements MethodImplementation {
         };
     }
 
-    @Nonnull @Override public List<? extends TryBlock<? extends ExceptionHandler>> getTryBlocks() {
+    @Nonnull @Override public List<BuilderTryBlock> getTryBlocks() {
         if (fixInstructions) {
             fixInstructions();
         }
@@ -483,9 +483,11 @@ public class MutableMethodImplementation implements MethodImplementation {
     }
 
     @Nonnull
-    public Label newSwitchPayloadReferenceLabel(@Nonnull int[] codeAddressToIndex, int codeAddress) {
+    public Label newSwitchPayloadReferenceLabel(@Nonnull MethodLocation switchLocation,
+                                                @Nonnull int[] codeAddressToIndex, int codeAddress) {
         MethodLocation referent = instructionList.get(mapCodeAddressToIndex(codeAddressToIndex, codeAddress));
-        Label label = new SwitchPayloadReferenceLabel();
+        SwitchPayloadReferenceLabel label = new SwitchPayloadReferenceLabel();
+        label.switchLocation = switchLocation;
         referent.getLabels().add(label);
         return label;
     }
@@ -528,7 +530,7 @@ public class MutableMethodImplementation implements MethodImplementation {
                 setInstruction(location, newBuilderInstruction21ih((Instruction21ih)instruction));
                 return;
             case Format21lh:
-                setInstruction(location, newBuilderInstruction10x((Instruction10x)instruction));
+                setInstruction(location, newBuilderInstruction21lh((Instruction21lh)instruction));
                 return;
             case Format21s:
                 setInstruction(location, newBuilderInstruction21s((Instruction21s)instruction));
@@ -567,7 +569,7 @@ public class MutableMethodImplementation implements MethodImplementation {
                 setInstruction(location, newBuilderInstruction31i((Instruction31i)instruction));
                 return;
             case Format31t:
-                setInstruction(location, newBuilderInstruction31t(location.codeAddress, codeAddressToIndex,
+                setInstruction(location, newBuilderInstruction31t(location, codeAddressToIndex,
                         (Instruction31t)instruction));
                 return;
             case Format32x:
@@ -589,8 +591,10 @@ public class MutableMethodImplementation implements MethodImplementation {
             case SparseSwitchPayload:
                 setInstruction(location,
                         newBuilderSparseSwitchPayload(location, codeAddressToIndex, (SparseSwitchPayload)instruction));
+                return;
             case ArrayPayload:
                 setInstruction(location, newBuilderArrayPayload((ArrayPayload)instruction));
+                return;
             default:
                 throw new ExceptionWithContext("Instruction format %s not supported", instruction.getOpcode().format);
         }
@@ -662,7 +666,7 @@ public class MutableMethodImplementation implements MethodImplementation {
         return new BuilderInstruction21ih(
                 instruction.getOpcode(),
                 instruction.getRegisterA(),
-                instruction.getHatLiteral());
+                instruction.getNarrowLiteral());
     }
 
     @Nonnull
@@ -670,7 +674,7 @@ public class MutableMethodImplementation implements MethodImplementation {
         return new BuilderInstruction21lh(
                 instruction.getOpcode(),
                 instruction.getRegisterA(),
-                instruction.getHatLiteral());
+                instruction.getWideLiteral());
     }
 
     @Nonnull
@@ -769,12 +773,13 @@ public class MutableMethodImplementation implements MethodImplementation {
     }
 
     @Nonnull
-    private BuilderInstruction31t newBuilderInstruction31t(int codeAddress, int[] codeAddressToIndex,
+    private BuilderInstruction31t newBuilderInstruction31t(@Nonnull MethodLocation location , int[] codeAddressToIndex,
                                                            @Nonnull Instruction31t instruction) {
+        int codeAddress = location.getCodeAddress();
         Label newLabel;
         if (instruction.getOpcode() != Opcode.FILL_ARRAY_DATA) {
             // if it's a sparse switch or packed switch
-            newLabel = newSwitchPayloadReferenceLabel(codeAddressToIndex, codeAddress + instruction.getCodeOffset());
+            newLabel = newSwitchPayloadReferenceLabel(location, codeAddressToIndex, codeAddress + instruction.getCodeOffset());
         } else {
             newLabel = newLabel(codeAddressToIndex, codeAddress + instruction.getCodeOffset());
         }
@@ -871,7 +876,7 @@ public class MutableMethodImplementation implements MethodImplementation {
 
         List<Label> labels = Lists.newArrayList();
         for (SwitchElement element: switchElements) {
-            labels.add(newLabel(codeAddressToIndex, element.getOffset() - baseAddress));
+            labels.add(newLabel(codeAddressToIndex, element.getOffset() + baseAddress));
         }
 
         return new BuilderPackedSwitchPayload(switchElements.get(0).getKey(), labels);
@@ -897,7 +902,7 @@ public class MutableMethodImplementation implements MethodImplementation {
         List<SwitchLabelElement> labelElements = Lists.newArrayList();
         for (SwitchElement element: switchElements) {
             labelElements.add(new SwitchLabelElement(element.getKey(),
-                    newLabel(codeAddressToIndex, element.getOffset() - baseAddress)));
+                    newLabel(codeAddressToIndex, element.getOffset() + baseAddress)));
         }
 
         return new BuilderSparseSwitchPayload(labelElements);
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderPackedSwitchPayload.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderPackedSwitchPayload.java
index 9469cd74..de74e4a0 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderPackedSwitchPayload.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderPackedSwitchPayload.java
@@ -31,15 +31,12 @@
 
 package org.jf.dexlib2.builder.instruction;
 
-import com.google.common.base.Function;
 import com.google.common.collect.ImmutableList;
 import com.google.common.collect.Lists;
 import org.jf.dexlib2.Format;
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.builder.BuilderSwitchPayload;
 import org.jf.dexlib2.builder.Label;
-import org.jf.dexlib2.builder.MethodLocation;
-import org.jf.dexlib2.iface.instruction.SwitchElement;
 import org.jf.dexlib2.iface.instruction.formats.PackedSwitchPayload;
 
 import javax.annotation.Nonnull;
@@ -49,7 +46,7 @@ import java.util.List;
 public class BuilderPackedSwitchPayload extends BuilderSwitchPayload implements PackedSwitchPayload {
     public static final Opcode OPCODE = Opcode.PACKED_SWITCH_PAYLOAD;
 
-    @Nonnull protected final List<? extends BuilderSwitchElement> switchElements;
+    @Nonnull protected final List<BuilderSwitchElement> switchElements;
 
     public BuilderPackedSwitchPayload(final int startKey,
                                       @Nullable List<? extends Label> switchElements) {
@@ -57,17 +54,15 @@ public class BuilderPackedSwitchPayload extends BuilderSwitchPayload implements
         if (switchElements == null) {
             this.switchElements = ImmutableList.of();
         } else {
-            this.switchElements = Lists.transform(switchElements, new Function<Label, BuilderSwitchElement>() {
-                int key = startKey;
-                @Nullable @Override public BuilderSwitchElement apply(@Nullable Label target) {
-                    assert target != null;
-                    return new BuilderSwitchElement(BuilderPackedSwitchPayload.this, key++, target);
-                }
-            });
+            this.switchElements = Lists.newArrayList();
+            int key = startKey;
+            for (Label target: switchElements) {
+                this.switchElements.add(new BuilderSwitchElement(this, key++, target));
+            }
         }
     }
 
-    @Nonnull @Override public List<? extends SwitchElement> getSwitchElements() { return switchElements; }
+    @Nonnull @Override public List<BuilderSwitchElement> getSwitchElements() { return switchElements; }
 
     @Override public int getCodeUnits() { return 4 + switchElements.size() * 2; }
     @Override public Format getFormat() { return OPCODE.format; }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSparseSwitchPayload.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSparseSwitchPayload.java
index 60dcaa65..c05f7d87 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSparseSwitchPayload.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSparseSwitchPayload.java
@@ -38,7 +38,6 @@ import org.jf.dexlib2.Format;
 import org.jf.dexlib2.Opcode;
 import org.jf.dexlib2.builder.BuilderSwitchPayload;
 import org.jf.dexlib2.builder.SwitchLabelElement;
-import org.jf.dexlib2.iface.instruction.SwitchElement;
 import org.jf.dexlib2.iface.instruction.formats.SparseSwitchPayload;
 
 import javax.annotation.Nonnull;
@@ -48,7 +47,7 @@ import java.util.List;
 public class BuilderSparseSwitchPayload extends BuilderSwitchPayload implements SparseSwitchPayload {
     public static final Opcode OPCODE = Opcode.SPARSE_SWITCH_PAYLOAD;
 
-    @Nonnull protected final List<? extends BuilderSwitchElement> switchElements;
+    @Nonnull protected final List<BuilderSwitchElement> switchElements;
 
     public BuilderSparseSwitchPayload(@Nullable List<? extends SwitchLabelElement> switchElements) {
         super(OPCODE);
@@ -64,7 +63,7 @@ public class BuilderSparseSwitchPayload extends BuilderSwitchPayload implements
         }
     }
 
-    @Nonnull @Override public List<? extends SwitchElement> getSwitchElements() { return switchElements; }
+    @Nonnull @Override public List<BuilderSwitchElement> getSwitchElements() { return switchElements; }
 
     @Override public int getCodeUnits() { return 2 + switchElements.size() * 4; }
     @Override public Format getFormat() { return OPCODE.format; }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSwitchElement.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSwitchElement.java
index 0a422a5c..8bf94650 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSwitchElement.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/builder/instruction/BuilderSwitchElement.java
@@ -26,4 +26,9 @@ public class BuilderSwitchElement implements SwitchElement {
     @Override public int getOffset() {
         return target.getCodeAddress() - parent.getReferrer().getCodeAddress();
     }
+
+    @Nonnull
+    public Label getTarget() {
+        return target;
+    }
 }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java
index 15d4fc2b..06f07796 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/DexBackedClassDef.java
@@ -152,16 +152,16 @@ public class DexBackedClassDef extends BaseTypeReference implements ClassDef {
             final int staticInitialValuesOffset =
                     dexFile.readSmallUint(classDefOffset + ClassDefItem.STATIC_VALUES_OFFSET);
             final int fieldsStartOffset = reader.getOffset();
-            final AnnotationsDirectory.AnnotationIterator annotationIterator =
-                    annotationsDirectory.getFieldAnnotationIterator();
-            final StaticInitialValueIterator staticInitialValueIterator =
-                    StaticInitialValueIterator.newOrEmpty(dexFile, staticInitialValuesOffset);
-
 
             return new Iterable<DexBackedField>() {
                 @Nonnull
                 @Override
                 public Iterator<DexBackedField> iterator() {
+                    final AnnotationsDirectory.AnnotationIterator annotationIterator =
+                            annotationsDirectory.getFieldAnnotationIterator();
+                    final StaticInitialValueIterator staticInitialValueIterator =
+                            StaticInitialValueIterator.newOrEmpty(dexFile, staticInitialValuesOffset);
+
                     return new VariableSizeLookaheadIterator<DexBackedField>(dexFile, fieldsStartOffset) {
                         private int count;
                         @Nullable private FieldReference previousField;
@@ -212,14 +212,15 @@ public class DexBackedClassDef extends BaseTypeReference implements ClassDef {
             DexReader reader = dexFile.readerAt(getInstanceFieldsOffset());
 
             final AnnotationsDirectory annotationsDirectory = getAnnotationsDirectory();
-            final AnnotationsDirectory.AnnotationIterator annotationIterator =
-                    annotationsDirectory.getFieldAnnotationIterator();
             final int fieldsStartOffset = reader.getOffset();
 
             return new Iterable<DexBackedField>() {
                 @Nonnull
                 @Override
                 public Iterator<DexBackedField> iterator() {
+                    final AnnotationsDirectory.AnnotationIterator annotationIterator =
+                            annotationsDirectory.getFieldAnnotationIterator();
+
                     return new VariableSizeLookaheadIterator<DexBackedField>(dexFile, fieldsStartOffset) {
                         private int count;
                         @Nullable private FieldReference previousField;
@@ -278,16 +279,17 @@ public class DexBackedClassDef extends BaseTypeReference implements ClassDef {
             DexReader reader = dexFile.readerAt(getDirectMethodsOffset());
 
             final AnnotationsDirectory annotationsDirectory = getAnnotationsDirectory();
-            final AnnotationsDirectory.AnnotationIterator methodAnnotationIterator =
-                    annotationsDirectory.getMethodAnnotationIterator();
-            final AnnotationsDirectory.AnnotationIterator parameterAnnotationIterator =
-                    annotationsDirectory.getParameterAnnotationIterator();
             final int methodsStartOffset = reader.getOffset();
 
             return new Iterable<DexBackedMethod>() {
                 @Nonnull
                 @Override
                 public Iterator<DexBackedMethod> iterator() {
+                    final AnnotationsDirectory.AnnotationIterator methodAnnotationIterator =
+                            annotationsDirectory.getMethodAnnotationIterator();
+                    final AnnotationsDirectory.AnnotationIterator parameterAnnotationIterator =
+                            annotationsDirectory.getParameterAnnotationIterator();
+
                     return new VariableSizeLookaheadIterator<DexBackedMethod>(dexFile, methodsStartOffset) {
                         private int count;
                         @Nullable private MethodReference previousMethod;
@@ -334,13 +336,14 @@ public class DexBackedClassDef extends BaseTypeReference implements ClassDef {
             DexReader reader = dexFile.readerAt(getVirtualMethodsOffset());
 
             final AnnotationsDirectory annotationsDirectory = getAnnotationsDirectory();
-            final AnnotationsDirectory.AnnotationIterator methodAnnotationIterator =
-                    annotationsDirectory.getMethodAnnotationIterator();
-            final AnnotationsDirectory.AnnotationIterator parameterAnnotationIterator =
-                    annotationsDirectory.getParameterAnnotationIterator();
             final int methodsStartOffset = reader.getOffset();
 
             return new Iterable<DexBackedMethod>() {
+                final AnnotationsDirectory.AnnotationIterator methodAnnotationIterator =
+                        annotationsDirectory.getMethodAnnotationIterator();
+                final AnnotationsDirectory.AnnotationIterator parameterAnnotationIterator =
+                        annotationsDirectory.getParameterAnnotationIterator();
+
                 @Nonnull
                 @Override
                 public Iterator<DexBackedMethod> iterator() {
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
index ca55d67c..3499eadc 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/dexbacked/raw/HeaderItem.java
@@ -51,9 +51,15 @@ public class HeaderItem {
 
     public static final int CHECKSUM_OFFSET = 8;
 
+    // this is the start of the checksumed data
+    public static final int CHECKSUM_DATA_START_OFFSET = 12;
     public static final int SIGNATURE_OFFSET = 12;
     public static final int SIGNATURE_SIZE = 20;
 
+    // this is the start of the sha-1 hashed data
+    public static final int SIGNATURE_DATA_START_OFFSET = 32;
+    public static final int FILE_SIZE_OFFSET = 32;
+
     public static final int HEADER_SIZE_OFFSET = 36;
 
     public static final int ENDIAN_TAG_OFFSET = 40;
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/immutable/debug/ImmutableStartLocal.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/immutable/debug/ImmutableStartLocal.java
index 635e92ad..db19f013 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/immutable/debug/ImmutableStartLocal.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/immutable/debug/ImmutableStartLocal.java
@@ -67,8 +67,8 @@ public class ImmutableStartLocal extends ImmutableDebugItem implements StartLoca
         return new ImmutableStartLocal(
                 startLocal.getCodeAddress(),
                 startLocal.getRegister(),
-                startLocal.getType(),
                 startLocal.getName(),
+                startLocal.getType(),
                 startLocal.getSignature());
     }
 
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
index ed591f7a..fef28015 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/DexWriter.java
@@ -236,7 +236,7 @@ public abstract class DexWriter<
         }
 
         byte[] buffer = new byte[4 * 1024];
-        InputStream input = dataStore.readAt(HeaderItem.HEADER_SIZE_OFFSET);
+        InputStream input = dataStore.readAt(HeaderItem.SIGNATURE_DATA_START_OFFSET);
         int bytesRead = input.read(buffer);
         while (bytesRead >= 0) {
             md.update(buffer, 0, bytesRead);
@@ -258,7 +258,7 @@ public abstract class DexWriter<
         Adler32 a32 = new Adler32();
 
         byte[] buffer = new byte[4 * 1024];
-        InputStream input = dataStore.readAt(HeaderItem.SIGNATURE_OFFSET);
+        InputStream input = dataStore.readAt(HeaderItem.CHECKSUM_DATA_START_OFFSET);
         int bytesRead = input.read(buffer);
         while (bytesRead >= 0) {
             a32.update(buffer, 0, bytesRead);
@@ -777,7 +777,7 @@ public abstract class DexWriter<
     }
 
     private void fixInstructions(@Nonnull MutableMethodImplementation methodImplementation) {
-        List<Instruction> instructions = methodImplementation.getInstructions();
+        List<? extends Instruction> instructions = methodImplementation.getInstructions();
 
         for (int i=0; i<instructions.size(); i++) {
             Instruction instruction = instructions.get(i);
@@ -798,18 +798,20 @@ public abstract class DexWriter<
                                @Nullable Iterable<? extends StringKey> parameterNames,
                                @Nullable Iterable<? extends DebugItem> debugItems) throws IOException {
         int parameterCount = 0;
+        int lastNamedParameterIndex = -1;
         if (parameterNames != null) {
+            parameterCount = Iterables.size(parameterNames);
             int index = 0;
             for (StringKey parameterName: parameterNames) {
-                index++;
                 if (parameterName != null) {
-                    parameterCount = index;
+                    lastNamedParameterIndex = index;
                 }
+                index++;
             }
         }
 
 
-        if (parameterCount == 0 && (debugItems == null || Iterables.isEmpty(debugItems))) {
+        if (lastNamedParameterIndex == -1 && (debugItems == null || Iterables.isEmpty(debugItems))) {
             return NO_OFFSET;
         }
 
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderClassPool.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderClassPool.java
index 91f6d4c8..780585b7 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderClassPool.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderClassPool.java
@@ -248,18 +248,18 @@ public class BuilderClassPool implements ClassSection<BuilderStringReference, Bu
 
     @Nullable @Override public List<? extends BuilderAnnotationSet> getParameterAnnotations(
             @Nonnull final BuilderMethod method) {
-        final int lastIndex = CollectionUtils.lastIndexOf(method.getParameters(), HAS_PARAMETER_ANNOTATIONS);
+        final List<? extends BuilderMethodParameter> parameters = method.getParameters();
+        boolean hasParameterAnnotations = Iterables.any(parameters, HAS_PARAMETER_ANNOTATIONS);
 
-        if (lastIndex > -1) {
+        if (hasParameterAnnotations) {
             return new AbstractForwardSequentialList<BuilderAnnotationSet>() {
                 @Nonnull @Override public Iterator<BuilderAnnotationSet> iterator() {
-                    return FluentIterable.from(method.getParameters())
-                            .limit(lastIndex+1)
+                    return FluentIterable.from(parameters)
                             .transform(PARAMETER_ANNOTATIONS).iterator();
                 }
 
                 @Override public int size() {
-                    return lastIndex+1;
+                    return parameters.size();
                 }
             };
         }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java
index f8818f7e..7b189fdb 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/builder/BuilderTypeListPool.java
@@ -55,7 +55,7 @@ class BuilderTypeListPool implements TypeListSection<BuilderTypeReference, Build
     }
 
     @Nonnull public BuilderTypeList internTypeList(@Nullable List<? extends CharSequence> types) {
-        if (types == null) {
+        if (types == null || types.size() == 0) {
             return BuilderTypeList.EMPTY;
         }
 
@@ -76,7 +76,7 @@ class BuilderTypeListPool implements TypeListSection<BuilderTypeReference, Build
     }
 
     @Override public int getNullableItemOffset(@Nullable BuilderTypeList key) {
-        return key==null?DexWriter.NO_OFFSET:key.offset;
+        return (key==null||key.size()==0)?DexWriter.NO_OFFSET:key.offset;
     }
 
     @Nonnull @Override
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
index a6f602ea..61ea02f7 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/ClassPool.java
@@ -371,18 +371,18 @@ public class ClassPool implements ClassSection<CharSequence, CharSequence,
 
     @Nullable @Override public List<? extends Set<? extends Annotation>> getParameterAnnotations(
             @Nonnull final PoolMethod method) {
-        final int lastIndex = CollectionUtils.lastIndexOf(method.getParameters(), HAS_PARAMETER_ANNOTATIONS);
+        final List<? extends MethodParameter> parameters = method.getParameters();
+        boolean hasParameterAnnotations = Iterables.any(parameters, HAS_PARAMETER_ANNOTATIONS);
 
-        if (lastIndex > -1) {
+        if (hasParameterAnnotations) {
             return new AbstractForwardSequentialList<Set<? extends Annotation>>() {
                 @Nonnull @Override public Iterator<Set<? extends Annotation>> iterator() {
-                    return FluentIterable.from(method.getParameters())
-                            .limit(lastIndex+1)
+                    return FluentIterable.from(parameters)
                             .transform(PARAMETER_ANNOTATIONS).iterator();
                 }
 
                 @Override public int size() {
-                    return lastIndex+1;
+                    return parameters.size();
                 }
             };
         }
diff --git a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java
index 50ffcb81..7e0fbe03 100644
--- a/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java
+++ b/brut.apktool.smali/dexlib2/src/main/java/org/jf/dexlib2/writer/pool/TypeListPool.java
@@ -32,10 +32,12 @@
 package org.jf.dexlib2.writer.pool;
 
 import com.google.common.collect.ImmutableList;
-import org.jf.dexlib2.writer.pool.TypeListPool.Key;
+import org.jf.dexlib2.writer.DexWriter;
 import org.jf.dexlib2.writer.TypeListSection;
+import org.jf.dexlib2.writer.pool.TypeListPool.Key;
 
 import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
 import java.util.Collection;
 import java.util.Iterator;
 
@@ -48,11 +50,13 @@ public class TypeListPool extends BaseNullableOffsetPool<Key<? extends Collectio
     }
 
     public void intern(@Nonnull Collection<? extends CharSequence> types) {
-        Key<? extends Collection<? extends CharSequence>> key = new Key<Collection<? extends CharSequence>>(types);
-        Integer prev = internedItems.put(key, 0);
-        if (prev == null) {
-            for (CharSequence type: types) {
-                typePool.intern(type);
+        if (types.size() > 0) {
+            Key<? extends Collection<? extends CharSequence>> key = new Key<Collection<? extends CharSequence>>(types);
+            Integer prev = internedItems.put(key, 0);
+            if (prev == null) {
+                for (CharSequence type: types) {
+                    typePool.intern(type);
+                }
             }
         }
     }
@@ -65,6 +69,14 @@ public class TypeListPool extends BaseNullableOffsetPool<Key<? extends Collectio
         return typesKey.types;
     }
 
+    @Override public int getNullableItemOffset(@Nullable Key<? extends Collection<? extends CharSequence>> key) {
+        if (key == null || key.types.size() == 0) {
+            return DexWriter.NO_OFFSET;
+        } else {
+            return super.getNullableItemOffset(key);
+        }
+    }
+
     public static class Key<TypeCollection extends Collection<? extends CharSequence>>
             implements Comparable<Key<? extends Collection<? extends CharSequence>>> {
         @Nonnull TypeCollection types;