Fix array not being resized

Author: Pokechu22

build.gradle

@@ -38,8 +38,8 @@ artifacts {
 }
 
 dependencies {
-    compile 'org.ow2.asm:asm:6.0'
-    compile 'org.ow2.asm:asm-tree:6.0'
+    compile 'org.ow2.asm:asm:6.1-beta2'
+    compile 'org.ow2.asm:asm-tree:6.1-beta2'
     compile 'net.sf.jopt-simple:jopt-simple:4.5'
     compile 'com.google.code.gson:gson:2.2.4'
 }

src/main/java/de/oceanlabs/mcp/mcinjector/adaptors/ParameterAnnotationFixer.java

@@ -22,7 +22,17 @@ public class ParameterAnnotationFixer extends ClassVisitor
 
     public ParameterAnnotationFixer(ClassVisitor cn, MCInjectorImpl mci)
     {
-        super(Opcodes.ASM5, cn);
+        super(Opcodes.ASM6, cn);
+        // Extra version check, since these were added in ASM 6.1 and there
+        // isn't a constant for it
+        try {
+            MethodNode.class.getField("visibleAnnotableParameterCount");
+            MethodNode.class.getField("invisibleAnnotableParameterCount");
+        } catch (Exception ex) {
+            throw new IllegalArgumentException(
+                    "AnnotableParameterCount fields are not present -- wrong ASM version?",
+                    ex);
+        }
     }
 
     @Override
@@ -123,6 +133,16 @@ private void processConstructor(ClassNode cls, MethodNode mn, Type[] syntheticPa
             mn.invisibleParameterAnnotations = process(methodInfo,
                     "RuntimeInvisibleParameterAnnotations", params.length,
                     syntheticParams.length, mn.invisibleParameterAnnotations);
+            // ASM uses this value, not the length of the array
+            // Note that this was added in ASM 6.1
+            if (mn.visibleParameterAnnotations != null)
+            {
+                mn.visibleAnnotableParameterCount = mn.visibleParameterAnnotations.length;
+            }
+            if (mn.invisibleParameterAnnotations != null)
+            {
+                mn.invisibleAnnotableParameterCount = mn.invisibleParameterAnnotations.length;
+            }
         }
         else
         {