diff options
| author | chibash <chiba@javassist.org> | 2019-12-23 18:34:44 +0900 |
|---|---|---|
| committer | chibash <chiba@javassist.org> | 2019-12-23 18:34:44 +0900 |
| commit | 559bc90de5251b499e6d54ee195b31bd33704a6a (patch) | |
| tree | e04a3e5fc64114783cde9f909b959c5844cf42c6 | |
| parent | 5a796e1c2e99be041ce8ecae96ad04390b6ff1ca (diff) | |
| download | javassist-559bc90de5251b499e6d54ee195b31bd33704a6a.tar.gz javassist-559bc90de5251b499e6d54ee195b31bd33704a6a.zip | |
fixdes Issue #282
| -rw-r--r-- | Readme.html | 2 | ||||
| -rw-r--r-- | javassist.jar | bin | 771213 -> 771271 bytes | |||
| -rw-r--r-- | src/main/javassist/bytecode/ConstPool.java | 4 | ||||
| -rw-r--r-- | src/main/javassist/bytecode/stackmap/Tracer.java | 4 |
4 files changed, 8 insertions, 2 deletions
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 Binary files differindex f1360688..e23d4140 100644 --- a/javassist.jar +++ b/javassist.jar 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); } |