wip(obfuscator): frame coompootation

Author: terminalsin

dev.skidfuscator.obfuscator/obfuscator/src/main/java/dev/skidfuscator/obfuscator/creator/SkidFlowGraphDumper.java

@@ -141,7 +141,7 @@ public void dump() {
 			m.node.visitLabel(getLabel(b));
 
 			iter: {
-				if (b.isEmpty() || true)
+				if (b.isEmpty())
 					break iter;
 
 				final SkidExpressionPool frameTypes = (SkidExpressionPool) b.getPool();

dev.skidfuscator.obfuscator/obfuscator/src/main/java/dev/skidfuscator/obfuscator/frame_V2/frame/FrameComputer.java

@@ -158,7 +158,7 @@ public void compute(final ControlFlowGraph cfg) {
 
             TypeHeader currentPool = poppedFrame.getPool().createChild();
 
-            TypeHeader highestPoolNoRandoAssExpression = currentPool;
+            TypeHeader highestPoolNoRandoAssExpression = null;
             boolean yeahNo = false;
 
             for (Stmt stmt : popped) {
@@ -382,15 +382,18 @@ else if (stmt instanceof UnconditionalJumpStmt) {
                 }
             }
 
-            final TypeHeader finalHighestPoolNoRandoAssExpression = cfg
+            /*final TypeHeader finalHighestPoolNoRandoAssExpression = cfg
                     .getReverseEdges(popped)
                     .stream()
                     .filter(TryCatchEdge.class::isInstance)
                     .map(e -> (TryCatchEdge<BasicBlock>) e)
                     .anyMatch(e -> e.erange.getHandler().equals(popped))
                         ? highestPoolNoRandoAssExpression.createChild()
-                        : poppedFrame.getPool().createChild();
+                        : poppedFrame.getPool().createChild();*/
 
+            final TypeHeader lastValidTryCatchPool = highestPoolNoRandoAssExpression == null
+                    ? currentPool.createChild()
+                    : highestPoolNoRandoAssExpression;
             cfg.getSuccessors(new Predicate<FlowEdge<BasicBlock>>() {
                 @Override
                 public boolean test(FlowEdge<BasicBlock> basicBlockFlowEdge) {
@@ -407,12 +410,12 @@ public boolean test(FlowEdge<BasicBlock> basicBlockFlowEdge) {
                 frameGraph.addEdge(new FrameEdge(
                         poppedFrame,
                         targetFrame,
-                        finalHighestPoolNoRandoAssExpression
+                        lastValidTryCatchPool
                 ));
 
                 // TODO:    Check if we should instead take the first
                 //          dominator index of the graph
-                targetFrame.getPool().addParent(finalHighestPoolNoRandoAssExpression);
+                targetFrame.getPool().addParent(lastValidTryCatchPool);
 
                 next.add(value);
             });
@@ -499,8 +502,9 @@ public boolean test(FlowEdge<BasicBlock> basicBlockFlowEdge) {
 
                         if (currentType.contains(desiredType)) {
                             poppedFrame.set(localIndex, desiredType);
-                        } else if (currentType.stream().anyMatch(c -> c.getSort() != Type.OBJECT)) {
+                        } else if (currentType.stream().allMatch(c -> c.getSort() == Type.OBJECT)) {
                             //final Type peekedType =
+                            poppedFrame.set(localIndex, desiredType);
                         }
                         // TODO: Var expr merging
                         /*if (currentType.equals(TypeUtil.OBJECT_TYPE)) {
@@ -655,6 +659,7 @@ public boolean test(FlowEdge<BasicBlock> basicBlockFlowEdge) {
             }
         }
 
+
         for (BasicBlock vertex : cfg.verticesInOrder()) {
             final FrameNode frameNode = frameMap.get(vertex);
 
@@ -718,6 +723,24 @@ public boolean test(FlowEdge<BasicBlock> basicBlockFlowEdge) {
             vertex.setPool(expressionPool);
         }
 
+        final Set<FrameEdge> visitedEdges = new HashSet<>();
+
+        for (FrameNode vertex : frameGraph.vertices()) {
+            visitedEdges.addAll(frameGraph.getEdges(vertex));
+        }
+
+        for (FrameEdge frameEdge : visitedEdges) {
+            final Type[] types = new Type[frameEdge.frame().size()];
+            for (int i = 0; i < types.length; i++) {
+                final Set<Type> computed = frameEdge.frame().get(i);
+                for (Type type : computed) {
+                    types[i] = TypeUtil.mergeTypes(skidfuscator, type, types[i]);
+                }
+
+                frameEdge.frame().set(i, types[i]);
+            }
+        }
+
         if (cfg.getName().equals("exportLog")) {
             IPropertyDictionary dict = PropertyHelper.createDictionary();
             dict.put(new BooleanProperty(CFGExporterUtils.OPT_EDGES, true));

dev.skidfuscator.obfuscator/obfuscator/src/main/java/dev/skidfuscator/obfuscator/frame_V2/frame/type/TypeHeader.java

@@ -1,6 +1,7 @@
 package dev.skidfuscator.obfuscator.frame_V2.frame.type;
 
 import dev.skidfuscator.obfuscator.Skidfuscator;
+import dev.skidfuscator.obfuscator.util.TypeUtil;
 import org.objectweb.asm.Type;
 
 import java.util.Arrays;
@@ -95,7 +96,7 @@ private Set<Type> _get(final int index, final Set<TypeHeader> visited) {
         final Set<Type> types = new HashSet<>();
 
         if (type != null && (excluded == null || !excluded.contains(type))) {
-            types.add(type);
+            return new HashSet<>(Collections.singleton(type));
         }
 
         for (TypeHeader parent : parents) {
@@ -112,6 +113,10 @@ private Set<Type> _get(final int index, final Set<TypeHeader> visited) {
             }
         }
 
+        if (types.isEmpty()) {
+            types.add(TypeUtil.UNDEFINED_TYPE);
+        }
+
         return types;
     }
 

dev.skidfuscator.obfuscator/obfuscator/src/main/java/dev/skidfuscator/obfuscator/util/MapleJarUtil.java

@@ -62,7 +62,7 @@ public int dumpClass(JarOutputStream out, JarClassData classData) throws IOExcep
                 try {
                     out.putNextEntry(entry);
                     try {
-                        ClassWriter writer = this.buildClassWriter(tree, ClassWriter.COMPUTE_FRAMES);
+                        ClassWriter writer = this.buildClassWriter(tree, ClassWriter.COMPUTE_MAXS);
                         cn.node.accept(writer);
                         out.write(writer.toByteArray());
                     } catch (Exception var8) {