remove raw casts to Object

2 files changed, 42 insertions, 1 deletions

diff --git a/src/main/java/cuchaz/enigma/Deobfuscator.java b/src/main/java/cuchaz/enigma/Deobfuscator.java
index 6ea1c40b..5b210110 100644
--- a/src/main/java/cuchaz/enigma/Deobfuscator.java
+++ b/src/main/java/cuchaz/enigma/Deobfuscator.java
@@ -34,6 +34,7 @@ import cuchaz.enigma.mapping.entry.*;
 import cuchaz.enigma.throwables.IllegalNameException;
 import cuchaz.enigma.utils.Utils;
 import oml.ast.transformers.ObfuscatedEnumSwitchRewriterTransform;
+import oml.ast.transformers.RemoveObjectCasts;
 import org.objectweb.asm.ClassWriter;
 import org.objectweb.asm.Opcodes;
 import org.objectweb.asm.tree.ClassNode;
@@ -661,7 +662,8 @@ public class Deobfuscator {
 
         public static void runCustomTransforms(AstBuilder builder, DecompilerContext context){
                 List<IAstTransform> transformers = Arrays.asList(
-                                new ObfuscatedEnumSwitchRewriterTransform(context)
+                                new ObfuscatedEnumSwitchRewriterTransform(context),
+                                new RemoveObjectCasts(context)
                 );
                 for (IAstTransform transform : transformers){
                         transform.run(builder.getCompilationUnit());
diff --git a/src/main/java/oml/ast/transformers/RemoveObjectCasts.java b/src/main/java/oml/ast/transformers/RemoveObjectCasts.java
new file mode 100644
index 00000000..d7c3c4a6
--- /dev/null
+++ b/src/main/java/oml/ast/transformers/RemoveObjectCasts.java
@@ -0,0 +1,39 @@
+package oml.ast.transformers;
+
+import com.strobel.assembler.metadata.BuiltinTypes;
+import com.strobel.decompiler.DecompilerContext;
+import com.strobel.decompiler.languages.java.ast.AstNode;
+import com.strobel.decompiler.languages.java.ast.CastExpression;
+import com.strobel.decompiler.languages.java.ast.ContextTrackingVisitor;
+import com.strobel.decompiler.languages.java.ast.transforms.IAstTransform;
+
+/**
+ * Created by Thiakil on 11/07/2018.
+ */
+public class RemoveObjectCasts implements IAstTransform {
+        private final DecompilerContext _context;
+
+        public RemoveObjectCasts(DecompilerContext context) {
+                _context = context;
+        }
+
+        @Override
+        public void run(AstNode compilationUnit) {
+                compilationUnit.acceptVisitor(new Visitor(_context), null);
+        }
+
+        private final static class Visitor extends ContextTrackingVisitor<Void>{
+
+                protected Visitor(DecompilerContext context) {
+                        super(context);
+                }
+
+                @Override
+                public Void visitCastExpression(CastExpression node, Void data) {
+                        if (node.getType().toTypeReference().equals(BuiltinTypes.Object)){
+                                node.replaceWith(node.getExpression());
+                        }
+                        return super.visitCastExpression(node, data);
+                }
+        }
+}