Fix #14 : Not needed boxing method calls are emitted

emmanue1 · emmanue1 · commit 45f632b84b55 · 2020-02-09T15:13:25.000+01:00
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/BaseExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/BaseExpression.java
@@ -7,6 +7,7 @@
 
 package org.jd.core.v1.model.javasyntax.expression;
 
+import org.jd.core.v1.model.javasyntax.type.ObjectType;
 import org.jd.core.v1.util.Base;
 
 import static org.jd.core.v1.model.javasyntax.expression.NoExpression.NO_EXPRESSION;
@@ -55,7 +56,9 @@ public interface BaseExpression extends Base<Expression> {
     default double getDoubleValue() { return 0D; }
     default float getFloatValue() { return 0F; }
     default int getIntegerValue() { return 0; }
+    default String getInternalTypeName() { return ""; }
     default long getLongValue() { return 0L; }
     default String getName() { return ""; }
+    default ObjectType getObjectType() { return ObjectType.TYPE_UNDEFINED_OBJECT; }
     default String getOperator() { return ""; }
 }
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/ConstructorReferenceExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/ConstructorReferenceExpression.java
@@ -26,6 +26,7 @@ public ConstructorReferenceExpression(int lineNumber, Type type, ObjectType obje
         this.descriptor = descriptor;
     }
 
+    @Override
     public ObjectType getObjectType() {
         return objectType;
     }
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/EnumConstantReferenceExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/EnumConstantReferenceExpression.java
@@ -31,6 +31,7 @@ public Type getType() {
         return type;
     }
 
+    @Override
     public ObjectType getObjectType() {
         return type;
     }
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/FieldReferenceExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/FieldReferenceExpression.java
@@ -40,6 +40,7 @@ public void setExpression(Expression expression) {
         this.expression = expression;
     }
 
+    @Override
     public String getInternalTypeName() {
         return internalTypeName;
     }
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/MethodReferenceExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/MethodReferenceExpression.java
@@ -40,6 +40,7 @@ public void setExpression(Expression expression) {
         this.expression = expression;
     }
 
+    @Override
     public String getInternalTypeName() {
         return internalTypeName;
     }
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/NewExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/NewExpression.java
@@ -30,6 +30,7 @@ public NewExpression(int lineNumber, ObjectType type, String descriptor, BodyDec
         this.bodyDeclaration = bodyDeclaration;
     }
 
+    @Override
     public ObjectType getObjectType() {
         return type;
     }
diff --git a/src/main/java/org/jd/core/v1/model/javasyntax/expression/ObjectTypeReferenceExpression.java b/src/main/java/org/jd/core/v1/model/javasyntax/expression/ObjectTypeReferenceExpression.java
@@ -42,6 +42,7 @@ public int getLineNumber() {
         return lineNumber;
     }
 
+    @Override
     public ObjectType getObjectType() {
         return type;
     }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/StatementMaker.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/util/StatementMaker.java
@@ -44,6 +44,7 @@ public class StatementMaker {
     protected static final SwitchCaseComparator SWITCH_CASE_COMPARATOR = new SwitchCaseComparator();
     protected static final NullExpression FINALLY_EXCEPTION_EXPRESSION = new NullExpression(new ObjectType("java/lang/Exception", "java.lang.Exception", "Exception"));
     protected static final MergeTryWithResourcesStatementVisitor MERGE_TRY_WITH_RESOURCES_STATEMENT_VISITOR = new MergeTryWithResourcesStatementVisitor();
+    protected static final AutoboxingVisitor AUTOBOXING_VISITOR = new AutoboxingVisitor();
 
     protected TypeMaker typeMaker;
     protected Map<String, BaseType> typeBounds;
@@ -60,6 +61,7 @@ public class StatementMaker {
     protected MemberVisitor memberVisitor = new MemberVisitor();
     protected boolean removeFinallyStatementsFlag = false;
     protected boolean mergeTryWithResourcesStatementFlag = false;
+    protected boolean autoBoxingSupported;
 
     public StatementMaker(
             TypeMaker typeMaker, LocalVariableMaker localVariableMaker,
@@ -74,6 +76,7 @@ public StatementMaker(
         this.removeFinallyStatementsVisitor = new RemoveFinallyStatementsVisitor(localVariableMaker);
         this.removeBinaryOpReturnStatementsVisitor = new RemoveBinaryOpReturnStatementsVisitor(localVariableMaker);
         this.updateIntegerConstantTypeVisitor = new UpdateIntegerConstantTypeVisitor(comd.getReturnedType());
+        this.autoBoxingSupported = (majorVersion >= 49); // (majorVersion >= Java 5)
     }
 
     public Statements make(ControlFlowGraph cfg) {
@@ -113,6 +116,10 @@ public Statements make(ControlFlowGraph cfg) {
         // Change ++i; with i++;
         replacePreOperatorWithPostOperator(statements);
 
+        if (autoBoxingSupported) {
+            statements.accept(AUTOBOXING_VISITOR);
+        }
+
         if (!jumps.isEmpty()) {
             updateJumpStatements(jumps);
         }
diff --git a/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/AutoboxingVisitor.java b/src/main/java/org/jd/core/v1/service/converter/classfiletojavasyntax/visitor/AutoboxingVisitor.java
@@ -0,0 +1,41 @@
+/*
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.core.v1.service.converter.classfiletojavasyntax.visitor;
+
+import org.jd.core.v1.model.javasyntax.expression.Expression;
+
+public class AutoboxingVisitor extends AbstractUpdateExpressionVisitor {
+
+    protected Expression updateExpression(Expression expression) {
+        if (expression.isMethodInvocationExpression()) {
+            switch (expression.getInternalTypeName()) {
+                case "java/lang/Boolean":
+                case "java/lang/Byte":
+                case "java/lang/Character":
+                case "java/lang/Float":
+                case "java/lang/Integer":
+                case "java/lang/Long":
+                case "java/lang/Short":
+                case "java/lang/Double":
+                    if (expression.getExpression().isObjectTypeReferenceExpression()) {
+                        // static method invocation
+                        if (expression.getName().equals("valueOf") && (expression.getParameters().size() == 1)) {
+                            return expression.getParameters().getFirst();
+                        }
+                    } else {
+                        // non-static method invocation
+                        if (expression.getName().endsWith("Value") && (expression.getParameters() == null)) {
+                            return expression.getExpression();
+                        }
+                    }
+            }
+        }
+
+        return expression;
+    }
+}
diff --git a/src/test/java/org/jd/core/v1/JavaAutoboxingTest.java b/src/test/java/org/jd/core/v1/JavaAutoboxingTest.java
@@ -0,0 +1,92 @@
+/*
+ * Copyright (c) 2008, 2019 Emmanuel Dupuy.
+ * This project is distributed under the GPLv3 license.
+ * This is a Copyleft license that gives the user the right to use,
+ * copy and modify the code freely for non-commercial purposes.
+ */
+
+package org.jd.core.v1;
+
+import junit.framework.TestCase;
+import org.jd.core.v1.api.loader.Loader;
+import org.jd.core.v1.api.printer.Printer;
+import org.jd.core.v1.compiler.CompilerUtil;
+import org.jd.core.v1.compiler.JavaSourceFileObject;
+import org.jd.core.v1.loader.ClassPathLoader;
+import org.jd.core.v1.model.message.Message;
+import org.jd.core.v1.printer.PlainTextPrinter;
+import org.jd.core.v1.regex.PatternMaker;
+import org.jd.core.v1.service.converter.classfiletojavasyntax.ClassFileToJavaSyntaxProcessor;
+import org.jd.core.v1.service.deserializer.classfile.DeserializeClassFileProcessor;
+import org.jd.core.v1.service.fragmenter.javasyntaxtojavafragment.JavaSyntaxToJavaFragmentProcessor;
+import org.jd.core.v1.service.layouter.LayoutFragmentProcessor;
+import org.jd.core.v1.service.tokenizer.javafragmenttotoken.JavaFragmentToTokenProcessor;
+import org.jd.core.v1.service.writer.WriteTokenProcessor;
+import org.junit.Test;
+
+import java.util.Collections;
+import java.util.Map;
+
+public class JavaAutoboxingTest extends TestCase {
+    protected DeserializeClassFileProcessor deserializer = new DeserializeClassFileProcessor();
+    protected ClassFileToJavaSyntaxProcessor converter = new ClassFileToJavaSyntaxProcessor();
+    protected JavaSyntaxToJavaFragmentProcessor fragmenter = new JavaSyntaxToJavaFragmentProcessor();
+    protected LayoutFragmentProcessor layouter = new LayoutFragmentProcessor();
+    //protected TestTokenizeJavaFragmentProcessor tokenizer = new TestTokenizeJavaFragmentProcessor();
+    protected JavaFragmentToTokenProcessor tokenizer = new JavaFragmentToTokenProcessor();
+    protected WriteTokenProcessor writer = new WriteTokenProcessor();
+
+    @Test
+    // https://github.com/java-decompiler/jd-core/issues/14
+    public void testAutoboxing() throws Exception {
+        class AutoboxingAndUnboxing {
+            void test() {
+                Integer intObj = 10;
+                int i = intObj;
+            }
+        }
+
+        String internalClassName = AutoboxingAndUnboxing.class.getName().replace('.', '/');
+        String source = decompile(new ClassPathLoader(), new PlainTextPrinter(), internalClassName);
+
+        // Check decompiled source code
+        assertTrue(source.matches(PatternMaker.make(": 44 */", "Integer intObj = 10;")));
+        assertTrue(source.matches(PatternMaker.make(": 45 */", "int i = intObj;")));
+
+        // Recompile decompiled source code and check errors
+        assertTrue(CompilerUtil.compile("1.8", new JavaSourceFileObject(internalClassName, source)));
+    }
+
+    protected String decompile(Loader loader, Printer printer, String internalTypeName) throws Exception {
+        return decompile(loader, printer, internalTypeName, Collections.emptyMap());
+    }
+
+    protected String decompile(Loader loader, Printer printer, String internalTypeName, Map<String, Object> configuration) throws Exception {
+        Message message = new Message();
+        message.setHeader("loader", loader);
+        message.setHeader("printer", printer);
+        message.setHeader("mainInternalTypeName", internalTypeName);
+        message.setHeader("configuration", configuration);
+
+        deserializer.process(message);
+        converter.process(message);
+        fragmenter.process(message);
+        layouter.process(message);
+        tokenizer.process(message);
+        writer.process(message);
+
+        String source = printer.toString();
+
+        printSource(source);
+
+        assertTrue(source.indexOf("// Byte code:") == -1);
+
+        return source;
+    }
+
+    protected void printSource(String source) {
+        System.out.println("- - - - - - - - ");
+        System.out.println(source);
+        System.out.println("- - - - - - - - ");
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -26,6 +26,7 @@ public ConstructorReferenceExpression(int lineNumber, Type type, ObjectType obje`
`26`	`26`	`this.descriptor = descriptor;`
`27`	`27`	`}`
`28`	`28`
	`29`	`+ @Override`
`29`	`30`	`public ObjectType getObjectType() {`
`30`	`31`	`return objectType;`
`31`	`32`	`}`
Original file line number	Diff line number	Diff line change
`@@ -31,6 +31,7 @@ public Type getType() {`
`31`	`31`	`return type;`
`32`	`32`	`}`
`33`	`33`
	`34`	`+ @Override`
`34`	`35`	`public ObjectType getObjectType() {`
`35`	`36`	`return type;`
`36`	`37`	`}`
Original file line number	Diff line number	Diff line change
`@@ -40,6 +40,7 @@ public void setExpression(Expression expression) {`
`40`	`40`	`this.expression = expression;`
`41`	`41`	`}`
`42`	`42`
	`43`	`+ @Override`
`43`	`44`	`public String getInternalTypeName() {`
`44`	`45`	`return internalTypeName;`
`45`	`46`	`}`
Original file line number	Diff line number	Diff line change
`@@ -30,6 +30,7 @@ public NewExpression(int lineNumber, ObjectType type, String descriptor, BodyDec`
`30`	`30`	`this.bodyDeclaration = bodyDeclaration;`
`31`	`31`	`}`
`32`	`32`
	`33`	`+ @Override`
`33`	`34`	`public ObjectType getObjectType() {`
`34`	`35`	`return type;`
`35`	`36`	`}`
Original file line number	Diff line number	Diff line change
`@@ -42,6 +42,7 @@ public int getLineNumber() {`
`42`	`42`	`return lineNumber;`
`43`	`43`	`}`
`44`	`44`
	`45`	`+ @Override`
`45`	`46`	`public ObjectType getObjectType() {`
`46`	`47`	`return type;`
`47`	`48`	`}`