fixdes Issue #282

diff --git a/Readme.html b/Readme.html
index 38c37368583ba689136be0a9d1ff4b24a694a1b2..fe9908d4d1a22632de22d57e94aa887a6b354b31 100644 (file)
--- a/Readme.html
+++ b/Readme.html
@@ -283,7 +283,7 @@ see javassist.Dump.
 
 <p>-version 3.27
 <ul>
-   <li>GitHub Issue #271 (PR #279).
+   <li>GitHub Issue #271 (PR #279), #280 (PR #281), and #282.
 </ul>
 
 <p>-version 3.26 on October 3, 2019

diff --git a/javassist.jar b/javassist.jar
index f1360688b884b49bff071a298ff2d8d29cdc68d7..e23d41405c877d552bf0c535146471cc83598c26 100644 (file)
Binary files a/javassist.jar and b/javassist.jar differ

diff --git a/src/main/javassist/bytecode/ConstPool.java b/src/main/javassist/bytecode/ConstPool.java
index 028aad084e5b8f31d01c8e70c254e8a6c43425a5..1ce26b3ec90d7964ea172cc27f8a184cf2334457 100644 (file)
--- a/src/main/javassist/bytecode/ConstPool.java
+++ b/src/main/javassist/bytecode/ConstPool.java
@@ -110,8 +110,10 @@ public final class ConstPool
     public static final int CONST_Dynamic = DynamicInfo.tag;
 
     /**
-     * <code>CONSTANT_InvokeDynamic</code>
+     * <code>CONSTANT_DynamicCallSite</code>,
+     * also known as <code>CONSTANT_InvokeDynamic</code>
      */
+    public static final int CONST_DynamicCallSite = InvokeDynamicInfo.tag;
     public static final int CONST_InvokeDynamic = InvokeDynamicInfo.tag;
 
     /**

diff --git a/src/main/javassist/bytecode/stackmap/Tracer.java b/src/main/javassist/bytecode/stackmap/Tracer.java
index 6f99e5f7a1112611f37e0419f9a65de41de75e5d..785f8208dafbafbe6de7757447a8c0d1429e265d 100644 (file)
--- a/src/main/javassist/bytecode/stackmap/Tracer.java
+++ b/src/main/javassist/bytecode/stackmap/Tracer.java
@@ -263,6 +263,10 @@ public abstract class Tracer implements TypeTag {
         }
         else if (tag == ConstPool.CONST_Class)
             stackTypes[stackTop++] = new TypeData.ClassName("java.lang.Class");
+        else if (tag == ConstPool.CONST_Dynamic) {
+            String desc = cpool.getDynamicType(index);
+            pushMemberType(desc);
+        }
         else
             throw new RuntimeException("bad LDC: " + tag);
     }