Merge branch 'targetBytecode' of https://gitea.hb.dhbw-stuttgart.de/JavaTX/JavaCompilerCore into targetBytecode

resources/bytecode/javFiles/Bug338.jav

@@ -0,0 +1,11 @@
+import java.util.List;
+import java.lang.Integer;
+import java.lang.String;
+import java.lang.Object;
+import java.util.List;
+
+public class Bug338 {
+    public hashCode() {
+        return List.of(42);
+    }
+}

src/main/java/de/dhbwstuttgart/target/generate/ASTToTargetAST.java

@@ -366,7 +366,6 @@ public class ASTToTargetAST {
             for (var i = 0; i < params.size(); i++) {
                 var a = TargetType.toPrimitive(params.get(i).pattern().type());
                 var b = convert(sParams.getFormalparalist().get(i).getType());
-                System.out.println(a + " " + b);
                 if (!Objects.equals(a, b)) return false;
             }
             return true;
@@ -387,8 +386,11 @@ public class ASTToTargetAST {
             var superMethod = findSuperMethodToOverride(currentClass, method.getName(), params);
             if (superMethod.isPresent()) {
                 // If we find a super method to override, use its parameters and return types
-                returnType = convert(superMethod.get().getReturnType(), this.generics.javaGenerics);
-                params = convert(superMethod.get().getParameterList(), method.getParameterList(), this.generics.javaGenerics);
+                var newReturnType = convert(superMethod.get().getReturnType(), this.generics.javaGenerics);
+                if (newReturnType instanceof TargetPrimitiveType && TargetType.toPrimitive(returnType).equals(newReturnType)) {
+                    returnType = newReturnType;
+                    params = convert(superMethod.get().getParameterList(), method.getParameterList(), this.generics.javaGenerics);
+                }
             }
 
             List<MethodParameter> finalParams = params;

src/test/java/TestComplete.java

@@ -1101,6 +1101,7 @@ public class TestComplete {
         var res = clazz.getDeclaredMethod("convert", List.class).invoke(instance, list);
         assertEquals(res, List.of(6, 7, 8));
     }
+
     @Test
     public void testBug325() throws Exception {
         var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug325.jav");
@@ -1131,4 +1132,11 @@ public class TestComplete {
         var clazz = classFiles.get("Bug333");
         var instance = clazz.getDeclaredConstructor().newInstance();
     }
+
+    @Test
+    public void testBug338() throws Exception {
+        var classFiles = generateClassFiles(new ByteArrayClassLoader(), "Bug338.jav");
+        var clazz = classFiles.get("Bug338");
+        var instance = clazz.getDeclaredConstructor().newInstance();
+    }
 }