Fix: Bug in ClassWriter.newInvokeDynamicItem when the Classwriter is created with a ClassReader.

src/org/objectweb/asm/ClassReader.java

@@ -422,8 +422,8 @@ public class ClassReader {
                         hashCode ^= readConst(readUnsignedShort(u), buf).hashCode();
                         u += 2;
                     }
-                    Item item = new Item();
-                    item.set(x, hashCode & 0x7FFFFFFF);
+                    Item item = new Item(j);
+                    item.set(x - v - 8, hashCode & 0x7FFFFFFF);
 
                     int index2 = item.hashCode % items2.length;
                     item.next = items2[index2];

src/org/objectweb/asm/ClassWriter.java

@@ -1190,7 +1190,7 @@ public class ClassWriter implements ClassVisitor {
         int length = (1 + 1 + argsLength) << 1; // (bsm + argCount + arguments)
         hashCode &= 0x7FFFFFFF;
         Item result = items[hashCode % items.length];
-        while (result != null) {
+        loop: while (result != null) {
             if (result.type != BSM || result.hashCode != hashCode) {
                 result = result.next;
                 continue;
@@ -1202,7 +1202,7 @@ public class ClassWriter implements ClassVisitor {
             for (int p = 0; p < length; p++) {
                 if (data[position + p] != data[resultPosition + p]) {
                     result = result.next;
-                    continue;
+                    continue loop;
                 }
             }
             break;