Auto stash before merge of "master" and "origin/master"

Author: terminalsin

.gitignore

@@ -30,3 +30,5 @@ org.mapleir.main/dot/
 *.DS_Store
 
 obfuscator/src/test/resources/test-out.jar
+
+obfuscator/src/test/resources/test-bozar.jar

maple-ir/org.mapleir.ir/src/main/java/org/mapleir/ir/code/CodeUnit.java

@@ -347,7 +347,7 @@ private Stmt getRootParent0() {
 		}
 	}
 
-	protected Set<Expr> _enumerate() {
+	public Set<Expr> _enumerate() {
 		Set<Expr> set = new HashSet<>();
 
 		if(opcode == Opcode.PHI) {

maple-ir/org.mapleir.ir/src/main/java/org/mapleir/ir/code/expr/invoke/InvocationExpr.java

@@ -8,6 +8,9 @@
 import org.objectweb.asm.MethodVisitor;
 import org.objectweb.asm.Type;
 
+import java.util.HashSet;
+import java.util.Set;
+
 public abstract class InvocationExpr extends Invocation implements IUsesJavaDesc {
 	public enum CallType {
 		STATIC, SPECIAL, VIRTUAL, INTERFACE, DYNAMIC
@@ -185,6 +188,17 @@ public boolean equivalent(CodeUnit s) {
 		return false;
 	}
 
+	@Override
+	public Set<Expr> _enumerate() {
+		Set<Expr> set = new HashSet<>();
+
+		for (Expr arg : args) {
+			set.add(arg);
+			set.addAll(arg._enumerate());
+		}
+		return set;
+	}
+
 	@Override
 	public Expr getPhysicalReceiver() {
 		if(isStatic()) {

obfuscator/src/main/java/dev/skidfuscator/obfuscator/Skidfuscator.java

@@ -105,7 +105,7 @@ public Skidfuscator(SkidfuscatorSession session) {
      * Runs the execution of the obfuscator.
      */
     public void run() {
-        LOGGER.post("Beginning Skidfuscator Enterprise...");
+        LOGGER.post("Beginning Skidfuscator Community...");
 
         /*
          * Initializes a null skid directory. This skid directory is used as a
@@ -428,6 +428,21 @@ public void run() {
             EventBus.register(o);
         }
         LOGGER.log("Finished loading transformers...");
+
+        LOGGER.post("Hot-loading exempt cache...");
+        int exempt = 0;
+        try (ProgressBar progressBar = ProgressUtil.progress(hierarchy.getClasses().size())) {
+            for (ClassNode ccls : hierarchy.getClasses()) {
+                final SkidClassNode classNode = (SkidClassNode) ccls;
+
+                if (exemptAnalysis.isExempt(classNode)) {
+                    exempt++;
+                }
+                progressBar.step();
+            }
+        }
+        LOGGER.log("Finished caching " + exempt + " exempted classes...");
+
         LOGGER.post("Executing transformers...");
 
         init();

obfuscator/src/main/java/dev/skidfuscator/obfuscator/SkidfuscatorSession.java

@@ -24,7 +24,6 @@ public class SkidfuscatorSession {
      * @return the input
      */
     public File getInput() {
-
         return input;
     }
 

obfuscator/src/main/java/dev/skidfuscator/obfuscator/exempt/ExclusionHelper.java

@@ -86,6 +86,7 @@ public boolean test(ClassNode var) {
                                             && regex.matcher(var.getName()).find();
                                 }
                             });
+
                             break;
                         }
 

obfuscator/src/main/java/dev/skidfuscator/obfuscator/phantom/jghost/Ghost.java

@@ -13,6 +13,7 @@ public class Ghost {
     private static final Gson GSON = new GsonBuilder()
             .setPrettyPrinting()
             .disableHtmlEscaping()
+            .serializeSpecialFloatingPointValues()
             .registerTypeAdapter(Type.class, new TypeSerializer())
             .create();
 

obfuscator/src/main/java/dev/skidfuscator/obfuscator/skidasm/expr/SkidConstantExpr.java

@@ -15,4 +15,9 @@ public SkidConstantExpr(Object cst, Type type, boolean check) {
     public SkidConstantExpr(Object cst, Type type) {
         super(cst, type);
     }
+
+    @Override
+    public ConstantExpr copy() {
+        return new SkidConstantExpr(this.getConstant(), this.getType(), false);
+    }
 }

obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/AbstractTransformer.java

@@ -14,6 +14,7 @@ public AbstractTransformer(Skidfuscator skidfuscator, String name) {
         this(skidfuscator, name, Collections.emptyList());
     }
 
+
     public AbstractTransformer(Skidfuscator skidfuscator, String name, List<Transformer> children) {
         this.skidfuscator = skidfuscator;
         this.name = name;

obfuscator/src/main/java/dev/skidfuscator/obfuscator/transform/impl/string/StringTransformer.java

@@ -69,9 +69,17 @@ void handle(final RunMethodTransformEvent event) {
         }
 
         cfg.allExprStream()
+                /*
+                 *
+                 */
                 .filter(SkidConstantExpr.class::isInstance)
                 .map(ConstantExpr.class::cast)
                 .filter(constantExpr -> constantExpr.getConstant() instanceof String)
+                /*
+                 * We collect since we're modifying the expression stream
+                 * we kinda need to just not cause any concurrency issue.
+                 * ¯\_(ツ)_/¯
+                 */
                 .collect(Collectors.toList())
                 .forEach(unit -> {
                     final CodeUnit parent = unit.getParent();