fixdes Issue #282

jboss-javassist · Dec 23, 2019 · 559bc90 · 559bc90
1 parent 5a796e1
commit 559bc90
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 2 deletions.
diff --git a/Readme.html b/Readme.html
@@ -283,7 +283,7 @@ <h2>Changes</h2>
 
 <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
diff --git 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
@@ -263,6 +263,10 @@ else if (tag == ConstPool.CONST_Double) {
         }
         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);
     }