From: chibash <chiba@javassist.org>
Date: Mon, 23 Dec 2019 09:34:44 +0000 (+0900)
Subject: fixdes Issue #282
X-Git-Tag: rel_3_27_0_ga~4
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=559bc90de5251b499e6d54ee195b31bd33704a6a;p=javassist.git

fixdes Issue #282
---

diff --git a/Readme.html b/Readme.html
index 38c37368..fe9908d4 100644
--- 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 f1360688..e23d4140 100644
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 028aad08..1ce26b3e 100644
--- 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 6f99e5f7..785f8208 100644
--- 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);
     }