Fixed SSA issue

Author: terminalsin

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/SkidMethodRenderer.java

@@ -50,8 +50,6 @@ public void render(final SkidSession skidSession) {
             projectPass.pass(skidSession);
         }
 
-
-
         final List<ClassNode> nodeList = Streams.stream(skidSession.getClassSource().iterate())
                 .parallel()
                 .filter(e -> skidSession.getClassSource().isApplicationClass(e.getName()))
@@ -83,7 +81,7 @@ public void render(final SkidSession skidSession) {
                         method = skidMethodMap.get(node);
                         break;
                     }
-                    if (node.node.instructions.size() > 6000) {
+                    if (node.node.instructions.size() > 3000) {
                         bar.step();
 
                         for (MethodNode methodNode1 : hierarchy) {

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/creator/SkidCache.java

@@ -0,0 +1,9 @@
+package dev.skidfuscator.obf.creator;
+
+import org.mapleir.context.IRCache;
+
+public class SkidCache extends IRCache {
+    public SkidCache() {
+        super(SkidFlowGraphBuilder::build);
+    }
+}

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/creator/SkidFlowGraphBuilder.java

@@ -0,0 +1,26 @@
+package dev.skidfuscator.obf.creator;
+
+import org.mapleir.asm.MethodNode;
+import org.mapleir.ir.algorithms.BoissinotDestructor;
+import org.mapleir.ir.algorithms.LocalsReallocator;
+import org.mapleir.ir.cfg.ControlFlowGraph;
+import org.mapleir.ir.cfg.builder.ControlFlowGraphBuilder;
+
+public class SkidFlowGraphBuilder extends ControlFlowGraphBuilder {
+    public SkidFlowGraphBuilder(MethodNode method) {
+        super(method);
+    }
+
+    public SkidFlowGraphBuilder(MethodNode method, boolean optimise) {
+        super(method, optimise);
+    }
+
+    public static ControlFlowGraph build(MethodNode method) {
+        ControlFlowGraphBuilder builder = new ControlFlowGraphBuilder(method);
+        final ControlFlowGraph cfg = builder.buildImpl();
+        BoissinotDestructor.leaveSSA(cfg);
+        LocalsReallocator.realloc(cfg);
+
+        return cfg;
+    }
+}

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/init/DefaultInitHandler.java

@@ -53,7 +53,6 @@ public SkidSession init(final File jar, final File output) {
 
         System.out.println("Evaluating classes...");
 
-
         for(Map.Entry<MethodNode, ControlFlowGraph> e : session.getCxt().getIRCache().entrySet()) {
             MethodNode mn = e.getKey();
             ControlFlowGraph cfg = e.getValue();
@@ -62,17 +61,6 @@ public SkidSession init(final File jar, final File output) {
             } catch (Exception ex){
                 ex.printStackTrace();
             }
-
-
-            SreedharDestructor.leaveSSA(cfg);
-            LocalsReallocator.realloc(cfg);
-
-            try {
-                cfg.verify();
-            } catch (Exception ex){
-                ex.printStackTrace();
-            }
-
         }
 
         final EntryPoint entryPoint = new MapleEntryPoint();

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/init/SkidSession.java

@@ -1,6 +1,7 @@
 package dev.skidfuscator.obf.init;
 
 import com.google.common.collect.Streams;
+import dev.skidfuscator.obf.creator.SkidCache;
 import dev.skidfuscator.obf.utils.Counter;
 import dev.skidfuscator.obf.yggdrasil.method.DefaultMethodInvokerResolver;
 import dev.skidfuscator.obf.yggdrasil.method.MethodInvokerResolver;
@@ -53,7 +54,7 @@ public SkidSession(ApplicationClassSource classSource, AbstractJarDownloader<Cla
         this.classSource = classSource;
         this.jarDownloader = jarDownloader;
         this.outputFile = outputFile;
-        this.irFactory = new IRCache(ControlFlowGraphBuilder::build);
+        this.irFactory = new SkidCache();
         this.cxt = new BasicAnalysisContext.BasicContextBuilder()
                 .setApplication(classSource)
                 .setInvocationResolver(new DefaultInvocationResolver(classSource))

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/transform/impl/flow/ConditionMutatorPass.java

@@ -47,6 +47,9 @@ public void pass(SkidSession session, SkidMethod method) {
                 if (parent.size() == 0)
                     continue;
 
+                if (methodNode.getNode().node.instructions.size() > 10000)
+                    continue;
+
                 final Stmt stmt = parent.get(parent.size() - 1);
 
                 if (!(stmt instanceof ConditionalJumpStmt)) {

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/transform/impl/flow/FakeJumpFlowPass.java

@@ -25,6 +25,9 @@ public void pass(SkidSession session, SkidMethod method) {
             if (methodNode.getNode().isAbstract() || methodNode.isInit())
                 continue;
 
+            if (methodNode.getNode().node.instructions.size() > 10000)
+                continue;
+
             final ControlFlowGraph cfg = session.getCxt().getIRCache().get(methodNode.getNode());
 
             if (cfg == null)

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/transform/impl/flow/FakeTryCatchFlowPass.java

@@ -44,6 +44,9 @@ public void pass(SkidSession session, SkidMethod method) {
             if (methodNode.getNode().isAbstract())
                 continue;
 
+            if (methodNode.getNode().node.instructions.size() > 10000)
+                continue;
+
             final ControlFlowGraph cfg = session.getCxt().getIRCache().get(methodNode.getNode());
 
             if (cfg == null)

dev.skidfuscator.obfuscator/src/main/java/dev/skidfuscator/obf/transform/impl/flow/NumberMutatorPass.java

@@ -30,6 +30,9 @@ public void pass(SkidSession session, SkidMethod method) {
             if (methodNode.getNode().isAbstract() || methodNode.isInit())
                 continue;
 
+            if (methodNode.getNode().node.instructions.size() > 10000)
+                continue;
+
             final ControlFlowGraph cfg = session.getCxt().getIRCache().get(methodNode.getNode());
 
             if (cfg == null)