sum transformer changes from its children

Author: EpicPlayerA10

CODE_OF_CONDUCT.md

@@ -3,6 +3,8 @@
 import java.util.*;
 import java.util.concurrent.ConcurrentHashMap;
 
+import org.apache.logging.log4j.LogManager;
+import org.apache.logging.log4j.Logger;
 import org.jetbrains.annotations.Nullable;
 import org.jetbrains.annotations.UnmodifiableView;
 import org.objectweb.asm.ClassReader;
@@ -16,6 +18,8 @@
 
 public class Context implements ClassProvider {
 
+  private static final Logger LOGGER = LogManager.getLogger();
+
   private final Map<String, ClassWrapper> classesMap = new ConcurrentHashMap<>();
   private final Map<String, byte[]> filesMap = new ConcurrentHashMap<>();
 
@@ -93,7 +97,7 @@ public void addCompiledClass(String pathInJar, byte[] bytes) {
 
       this.compiledClasses.addRawClass(bytes);
     } catch (InvalidClassException e) {
-      throw new RuntimeException(e);
+      LOGGER.error("Failed to load class {}", pathInJar);
     }
   }
 

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/context/Context.java

@@ -23,10 +23,8 @@ public ComposedTransformer(boolean rerunOnChange, Supplier<Transformer>... trans
   @Override
   protected void transform() {
     transformers.forEach(transformerSupplier -> {
-      boolean changed = Transformer.transform(transformerSupplier, scope(), context());
-      if (changed) {
-        this.markChange();
-      }
+      int changesCount = Transformer.transform(transformerSupplier, scope(), context());
+      this.changes.addAndGet(changesCount);
     });
   }
 }

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/transformer/ComposedTransformer.java

@@ -28,7 +28,7 @@ public abstract class Transformer extends AsmHelper implements Opcodes {
 
   // Internal variables
   private boolean hasRan = false;
-  private final AtomicInteger changes = new AtomicInteger(0);
+  public final AtomicInteger changes = new AtomicInteger(0);
 
   // Config
   protected boolean rerunOnChange = false;
@@ -106,13 +106,13 @@ private void init(Context context, ClassWrapper scope) {
    *                            You can't reuse the existing instance.
    * @param scope You can choose the class transform or set it to null to transform all classes
    * @param context The context
-   * @return If the transformation changed something
+   * @return Changes count
    */
-  public static boolean transform(Supplier<@Nullable Transformer> transformerSupplier, @Nullable ClassWrapper scope, Context context) {
+  public static int transform(Supplier<@Nullable Transformer> transformerSupplier, @Nullable ClassWrapper scope, Context context) {
     return transform(transformerSupplier, scope, context, false);
   }
 
-  private static boolean transform(
+  private static int transform(
       Supplier<@Nullable Transformer> transformerSupplier,
       @Nullable ClassWrapper scope,
       Context context,
@@ -121,7 +121,7 @@ private static boolean transform(
     Transformer transformer = transformerSupplier.get();
     if (transformer == null) {
       // Null means that transformer is disabled. Skip it
-      return false;
+      return 0;
     }
 
     if (transformer.hasRan) {
@@ -140,30 +140,30 @@ private static boolean transform(
       transformer.transform();
     } catch (TransformerException e) {
       LOGGER.error("! {}: {}", transformer.name(), e.getMessage());
-      return false;
+      return 0;
     } catch (Exception e) {
       LOGGER.error("Error occurred when transforming {}", transformer.name(), e);
       if (!context.getOptions().continueOnError()) {
         throw new RuntimeException(e);
       }
-      return false;
+      return 0;
     } finally {
       // Mark transformer that it was already used
       transformer.hasRan = true;
     }
 
-    boolean changed = transformer.isChanged();
+    int changesCount = transformer.getChangesCount();
 
-    LOGGER.info("Made {} changes", transformer.getChangesCount());
+    LOGGER.info("Made {} changes", changesCount);
     LOGGER.info("Ended {} transformer in {} ms", transformer.name(), (System.currentTimeMillis() - start));
 
-    if (changed && transformer.shouldRerunOnChange()) {
+    if (transformer.isChanged() && transformer.shouldRerunOnChange()) {
       LOGGER.info("\uD83D\uDD04 Changes detected. Rerunning {} transformer", transformer.name());
-      Transformer.transform(transformerSupplier, scope, context, true);
+      changesCount += Transformer.transform(transformerSupplier, scope, context, true);
     }
 
     // Bytecode verification
-    if (context.getOptions().verifyBytecode() && !reran && changed) {
+    if (context.getOptions().verifyBytecode() && !reran && transformer.isChanged()) {
       // Verify if bytecode is valid
       try {
         verifyBytecode(scope, context);
@@ -172,7 +172,7 @@ private static boolean transform(
       }
     }
 
-    return changed;
+    return changesCount;
   }
 
   /**

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/transformer/Transformer.java

@@ -12,8 +12,6 @@ public VersionedComposedTransformer(String version) {
     this.version = version;
   }
 
-  private boolean changed = false;
-
   @Override
   protected void transform() {
     Map<String, List<Supplier<Transformer>>> transformers = transformersByVersions();
@@ -23,11 +21,7 @@ protected void transform() {
 
     transformers
         .get(version)
-        .forEach(transformer -> changed |= Transformer.transform(transformer, scope(), context()));
-
-    if (changed) {
-      markChange();
-    }
+        .forEach(transformer -> this.changes.addAndGet(Transformer.transform(transformer, scope(), context())));
   }
 
   public abstract Map<String, List<Supplier<Transformer>>> transformersByVersions();

deobfuscator-api/src/main/java/uwu/narumi/deobfuscator/api/transformer/VersionedComposedTransformer.java

@@ -111,6 +111,11 @@ protected void transform() throws Exception {
       });
 
       classWrapper.fields().forEach(fieldNode -> {
+        // Remove ACC_ENUM from fields from classes that are not enums
+        if (!isAccess(classWrapper.classNode().access, ACC_ENUM)) {
+          fieldNode.access &= ~ACC_ENUM;
+        }
+
         for (int access : FIELD) {
           if (isAccess(fieldNode.access, access)) {
             fieldNode.access &= ~access;