Applied CONDY fix from jmockit#665; bumped version number to 1.49a

Author: Paul GUEST

main/pom.xml

@@ -4,7 +4,7 @@
    xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
    <modelVersion>4.0.0</modelVersion>
 
-   <groupId>org.jmockit</groupId><artifactId>jmockit</artifactId><version>1.49</version>
+   <groupId>org.jmockit</groupId><artifactId>jmockit</artifactId><version>1.49a</version>
    <packaging>jar</packaging>
 
    <name>JMockit</name>
@@ -234,4 +234,4 @@
          </exclusions>
       </dependency>
    </dependencies>
-</project>
+</project>

main/src/mockit/asm/constantPool/ConstantPoolGeneration.java

@@ -391,6 +391,11 @@ public Item newConstItem(@Nonnull Object cst) {
          return newMethodHandleItem((MethodHandle) cst);
       }
 
+      if(cst instanceof DynamicItem) {
+         DynamicItem dI = (DynamicItem)cst;
+         return createDynamicItem(dI.type, dI.name, dI.desc, dI.bsmIndex);
+      }
+
       throw new IllegalArgumentException("value " + cst);
    }
 
@@ -654,4 +659,4 @@ public DynamicItem createDynamicItem(int type, @Nonnull String name, @Nonnull St
 
       return result;
    }
-}
+}

main/src/mockit/asm/constantPool/DynamicItem.java

@@ -6,7 +6,7 @@
 
 public final class DynamicItem extends TypeOrMemberItem
 {
-   @Nonnegative private int bsmIndex;
+   @Nonnegative int bsmIndex;
 
    public DynamicItem(@Nonnegative int index) { super(index); }
 
@@ -34,4 +34,4 @@ boolean isEqualTo(@Nonnull Item item) {
       DynamicItem other = (DynamicItem) item;
       return other.bsmIndex == bsmIndex && isEqualTo(other);
    }
-}
+}

main/src/mockit/asm/util/BytecodeReader.java

@@ -2,6 +2,8 @@
 
 import javax.annotation.*;
 
+import mockit.asm.constantPool.DynamicItem;
+import mockit.asm.jvmConstants.ConstantPoolTypes;
 import mockit.asm.types.*;
 import static mockit.asm.jvmConstants.ConstantPoolTypes.*;
 
@@ -394,6 +396,15 @@ protected final Object readConst(@Nonnegative int itemIndex) {
          case MTYPE:
             String methodDesc = readNonnullUTF8(constCodeIndex);
             return MethodType.create(methodDesc);
+         case CONDY: {
+            int bsmStartIndex = readUnsignedShort(constCodeIndex);
+            int nameIndex = readItem(constCodeIndex + 2);
+            String name = readNonnullUTF8(nameIndex);
+            String desc = readNonnullUTF8(nameIndex + 2);
+            DynamicItem dynamicItem = new DynamicItem(itemIndex);
+            dynamicItem.set(ConstantPoolTypes.CONDY, name, desc, bsmStartIndex);
+            return dynamicItem;
+         }
       // case HANDLE_BASE + [1..9]:
          default:
             return readMethodHandle(constCodeIndex);
@@ -469,4 +480,4 @@ public final int readItem(@Nonnegative int u2CodeIndex) {
       int itemIndex = readUnsignedShort(u2CodeIndex);
       return items[itemIndex];
    }
-}
+}