match can be static

narumii · Sep 11, 2024 · 188472b · 188472b
1 parent 3148a9d
commit 188472b
Showing 1 changed file with 7 additions and 7 deletions.
diff --git a/...a/uwu/narumi/deobfuscator/core/other/impl/zkm/ZelixUselessTryCatchRemoverTransformer.java b/...a/uwu/narumi/deobfuscator/core/other/impl/zkm/ZelixUselessTryCatchRemoverTransformer.java
@@ -40,6 +40,12 @@ public class ZelixUselessTryCatchRemoverTransformer extends Transformer {
           OpcodeMatch.of(ARETURN)
       );
 
+  private static final Match INVOKE_AND_RETURN =
+      SequenceMatch.of(
+          MethodMatch.invokeStatic().save("invocation"),
+          OpcodeMatch.of(ATHROW)
+      );
+
   @Override
   protected void transform(ClassWrapper scope, Context context) throws Exception {
     context.classes(scope).forEach(classWrapper -> {
@@ -56,12 +62,6 @@ protected void transform(ClassWrapper scope, Context context) throws Exception {
         }
       });
 
-      Match invokeAndReturnMatch =
-          SequenceMatch.of(
-              MethodMatch.invokeStatic().save("invocation"),
-              OpcodeMatch.of(ATHROW)
-          );
-
       List<MethodRef> toRemove = new ArrayList<>();
 
       // Remove try-catches with these instant return exception methods
@@ -70,7 +70,7 @@ protected void transform(ClassWrapper scope, Context context) throws Exception {
 
         methodNode.tryCatchBlocks.removeIf(tryBlock -> {
           InstructionContext start = framelessContext.newInsnContext(tryBlock.handler.getNext());
-          MatchContext result = invokeAndReturnMatch.matchResult(start);
+          MatchContext result = INVOKE_AND_RETURN.matchResult(start);
           if (result != null) {
             MethodRef methodRef = MethodRef.of((MethodInsnNode) result.insn());