Merge remote-tracking branch 'origin/master'

deobfuscator-impl/src/test/java/uwu/narumi/deobfuscator/TestDeobfuscation.java

@@ -3,6 +3,7 @@
 import uwu.narumi.deobfuscator.core.other.composed.ComposedZelixTransformer;
 import uwu.narumi.deobfuscator.core.other.composed.general.ComposedGeneralFlowTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.clean.PeepholeCleanTransformer;
+import uwu.narumi.deobfuscator.core.other.impl.clean.peephole.JsrInlinerTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.pool.InlineLocalVariablesTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.pool.InlineStaticFieldTransformer;
 import uwu.narumi.deobfuscator.core.other.impl.universal.UniversalNumberTransformer;
@@ -29,6 +30,9 @@ protected void registerAll() {
     // Test sandbox security (e.g. not allowing dangerous calls)
     register("Sandbox security", InputType.JAVA_CODE, List.of(TestSandboxSecurityTransformer::new), Source.of("sandbox/TestSandboxSecurity", false));
 
+    // JSR Inlining
+    register("JSR Inlining", InputType.CUSTOM_CLASS, List.of(JsrInlinerTransformer::new), Source.of("JSR"));
+
     // Samples
     register("Some flow obf sample", InputType.CUSTOM_CLASS, List.of(ComposedGeneralFlowTransformer::new), Source.of("FlowObfSample"));
 

deobfuscator-transformers/src/main/java/uwu/narumi/deobfuscator/core/other/impl/clean/peephole/JsrInlinerTransformer.java

@@ -22,14 +22,17 @@ protected void transform(ClassWrapper scope, Context context) throws Exception {
 
         if (isJsr) {
           // Inline JSR instructions
-          methodNode.accept(new JSRInlinerAdapter(
+          final JSRInlinerAdapter adapter = new JSRInlinerAdapter(
               methodNode,
               methodNode.access,
               methodNode.name,
               methodNode.desc,
               methodNode.signature,
               methodNode.exceptions.toArray(new String[0])
-          ));
+          );
+
+          methodNode.accept(adapter);
+          classWrapper.methods().set(i, adapter);
 
           markChange();
         }

testData/results/custom-classes/JSR.dec

@@ -0,0 +1,13 @@
+import java.io.PrintStream;
+
+public class TestJSR {
+    public static void main(String[] var0) {
+        test(System.out);
+    }
+
+    public static void test(PrintStream var0) {
+        var0.println("In");
+        Object var1 = null;
+        var0.println("Out");
+    }
+}