From fa5a2795cb7ccd751e068312a9066d6844d765bf Mon Sep 17 00:00:00 2001 From: Roberto Araujo Date: Tue, 9 Apr 2024 15:24:42 -0300 Subject: [PATCH 1/3] Update ASM (9.5 -> 9.6) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 524ce44..9af9b12 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ org.ow2.asm asm-analysis - 9.5 + 9.6 br.usp.each.saeg From a9987ae698872b04789e19b427917c5f6c82382b Mon Sep 17 00:00:00 2001 From: Roberto Araujo Date: Tue, 9 Apr 2024 15:28:08 -0300 Subject: [PATCH 2/3] Use method `Type.getArgumentCount(String)` introduced in ASM 9.6 See: https://gitlab.ow2.org/asm/asm/-/merge_requests/380 --- src/main/java/br/usp/each/saeg/asm/defuse/DefUseFrame.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/br/usp/each/saeg/asm/defuse/DefUseFrame.java b/src/main/java/br/usp/each/saeg/asm/defuse/DefUseFrame.java index e30b146..ce47214 100644 --- a/src/main/java/br/usp/each/saeg/asm/defuse/DefUseFrame.java +++ b/src/main/java/br/usp/each/saeg/asm/defuse/DefUseFrame.java @@ -326,7 +326,7 @@ public void execute(final AbstractInsnNode insn, final Interpreter interp case Opcodes.INVOKEINTERFACE: { values = new ArrayList(); final String desc = ((MethodInsnNode) insn).desc; - for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) { + for (int i = Type.getArgumentCount(desc); i > 0; --i) { values.add(0, pop()); } if (insn.getOpcode() != Opcodes.INVOKESTATIC) { @@ -342,7 +342,7 @@ public void execute(final AbstractInsnNode insn, final Interpreter interp case Opcodes.INVOKEDYNAMIC: { values = new ArrayList(); final String desc = ((InvokeDynamicInsnNode) insn).desc; - for (int i = Type.getArgumentTypes(desc).length; i > 0; --i) { + for (int i = Type.getArgumentCount(desc); i > 0; --i) { values.add(0, pop()); } if (Type.getReturnType(desc) == Type.VOID_TYPE) { From cc595ce83aff3b38a43ace20e32ea18ce64c90eb Mon Sep 17 00:00:00 2001 From: Roberto Araujo Date: Tue, 9 Apr 2024 15:47:29 -0300 Subject: [PATCH 3/3] Update ASM (9.6 -> 9.7) --- pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pom.xml b/pom.xml index 9af9b12..64b0ada 100644 --- a/pom.xml +++ b/pom.xml @@ -317,7 +317,7 @@ org.ow2.asm asm-analysis - 9.6 + 9.7 br.usp.each.saeg