From 0749965bc9ff42dfdfe3c9f9e00055b2eee6c69b Mon Sep 17 00:00:00 2001 From: Tagir Valeev Date: Wed, 29 Jul 2020 13:15:14 +0700 Subject: [PATCH] [java-decompiler] initConstant: fix getField/putField handling GitOrigin-RevId: b741b6e3faf5d800ca2b607439b6a459bcb2bf6a --- .../java/decompiler/struct/consts/LinkConstant.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java index d8a92ca..b38800d 100644 --- a/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java +++ b/src/org/jetbrains/java/decompiler/struct/consts/LinkConstant.java @@ -26,10 +26,11 @@ public class LinkConstant extends PooledConstant { if (type == CONSTANT_Methodref || type == CONSTANT_InterfaceMethodref || type == CONSTANT_InvokeDynamic || - type == CONSTANT_MethodHandle) { + (type == CONSTANT_MethodHandle && index1 != CONSTANT_MethodHandle_REF_getField && index1 != CONSTANT_MethodHandle_REF_putField)) { int parenth = descriptor.indexOf(')'); if (descriptor.length() < 2 || parenth < 0 || descriptor.charAt(0) != '(') { - throw new IllegalArgumentException("Invalid descriptor: " + descriptor); + throw new IllegalArgumentException("Invalid descriptor: " + descriptor + + "; type = " + type + "; classname = " + classname + "; elementname = " + elementname); } } }