Fix interface default method overrides (#4402)

Fixed #4401

Author: shai-almog

vm/ByteCodeTranslator/src/com/codename1/tools/translator/ByteCodeClass.java

@@ -426,6 +426,20 @@ private boolean hasFinalizer() {
         }
         return false;
     }
+
+    private boolean isInterfaceInHierarchy(String className) {
+        if (clsName.equals(className)) {
+            return true;
+        }
+        if (baseInterfacesObject != null) {
+            for (ByteCodeClass bc : baseInterfacesObject) {
+                if (bc.isInterfaceInHierarchy(className)) {
+                    return true;
+                }
+            }
+        }
+        return false;
+    }
 
     public static void addArrayType(String type, int dimenstions) {
         String arr = dimenstions + "_" + type;
@@ -1614,7 +1628,7 @@ private void fillVirtualMethodTable(List<BytecodeMethod> virtualMethods, boolean
                         bm.setForceVirtual(true);
                     }
                 } else {
-                    if(replace) {
+                    if(replace || (isInterface && isInterfaceInHierarchy(virtualMethods.get(offset).getClsName()))) {
                         virtualMethods.set(offset, bm);
                         if(isInterface) {
                             bm.setForceVirtual(true);

vm/tests/src/test/java/com/codename1/tools/translator/ParserTest.java

@@ -131,6 +131,40 @@ void translatesDefaultInterfaceMethodImplementations() throws Exception {
                 "Implementing class should point vtable slot to the interface default method implementation");
     }
 
+    @Test
+    void translatesDefaultInterfaceMethodOverridesWithSuperCalls() throws Exception {
+        Parser.cleanup();
+
+        Path baseInterfaceFile = createBaseGreeterInterface();
+        Path derivedInterfaceFile = createDerivedGreeterInterface();
+        Path implFile = createDerivedGreeterImplementation();
+
+        Parser.parse(baseInterfaceFile.toFile());
+        Parser.parse(derivedInterfaceFile.toFile());
+        Parser.parse(implFile.toFile());
+
+        ByteCodeClass base = Parser.getClassObject("com_example_BaseGreeter");
+        ByteCodeClass derived = Parser.getClassObject("com_example_DerivedGreeter");
+        ByteCodeClass impl = Parser.getClassObject("com_example_DerivedGreeterImpl");
+
+        base.setBaseInterfacesObject(Collections.emptyList());
+        derived.setBaseInterfacesObject(Collections.singletonList(base));
+        impl.setBaseInterfacesObject(Collections.singletonList(derived));
+
+        base.updateAllDependencies();
+        derived.updateAllDependencies();
+        impl.updateAllDependencies();
+
+        List<ByteCodeClass> classes = Arrays.asList(base, derived, impl);
+        String derivedCode = derived.generateCCode(classes);
+        assertTrue(derivedCode.contains("com_example_BaseGreeter_greet___R_java_lang_String"),
+                "Derived default method should invoke base interface default method");
+
+        String implCode = impl.generateCCode(classes);
+        assertTrue(implCode.contains("&com_example_DerivedGreeter_greet___R_java_lang_String"),
+                "Implementing class should point vtable slot to the derived interface default method implementation");
+    }
+
     private ByteCodeField findField(ByteCodeClass cls, String name) {
         return cls.getFields()
                 .stream()
@@ -349,6 +383,74 @@ private Path createGreeterImplementation() throws Exception {
         });
     }
 
+    private Path createBaseGreeterInterface() throws Exception {
+        return writeClass("com/example/BaseGreeter", cw -> {
+            cw.visit(
+                    Opcodes.V1_8,
+                    Opcodes.ACC_PUBLIC | Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE,
+                    "com/example/BaseGreeter",
+                    null,
+                    "java/lang/Object",
+                    null
+            );
+
+            MethodVisitor greet = cw.visitMethod(Opcodes.ACC_PUBLIC, "greet", "()Ljava/lang/String;", null, null);
+            greet.visitCode();
+            greet.visitLdcInsn("base");
+            greet.visitInsn(Opcodes.ARETURN);
+            greet.visitMaxs(1, 1);
+            greet.visitEnd();
+
+            cw.visitEnd();
+        });
+    }
+
+    private Path createDerivedGreeterInterface() throws Exception {
+        return writeClass("com/example/DerivedGreeter", cw -> {
+            cw.visit(
+                    Opcodes.V1_8,
+                    Opcodes.ACC_PUBLIC | Opcodes.ACC_ABSTRACT | Opcodes.ACC_INTERFACE,
+                    "com/example/DerivedGreeter",
+                    null,
+                    "java/lang/Object",
+                    new String[]{"com/example/BaseGreeter"}
+            );
+
+            MethodVisitor greet = cw.visitMethod(Opcodes.ACC_PUBLIC, "greet", "()Ljava/lang/String;", null, null);
+            greet.visitCode();
+            greet.visitVarInsn(Opcodes.ALOAD, 0);
+            greet.visitMethodInsn(Opcodes.INVOKESPECIAL, "com/example/BaseGreeter", "greet", "()Ljava/lang/String;", true);
+            greet.visitInsn(Opcodes.ARETURN);
+            greet.visitMaxs(1, 1);
+            greet.visitEnd();
+
+            cw.visitEnd();
+        });
+    }
+
+    private Path createDerivedGreeterImplementation() throws Exception {
+        return writeClass("com/example/DerivedGreeterImpl", cw -> {
+            cw.visit(
+                    Opcodes.V1_8,
+                    Opcodes.ACC_PUBLIC | Opcodes.ACC_SUPER,
+                    "com/example/DerivedGreeterImpl",
+                    null,
+                    "java/lang/Object",
+                    new String[]{"com/example/DerivedGreeter"}
+            );
+
+            MethodVisitor init = cw.visitMethod(Opcodes.ACC_PUBLIC, "<init>", "()V", null, null);
+            init.visitCode();
+            init.visitVarInsn(Opcodes.ALOAD, 0);
+            init.visitMethodInsn(Opcodes.INVOKESPECIAL, "java/lang/Object", "<init>", "()V", false);
+            init.visitInsn(Opcodes.RETURN);
+            init.visitMaxs(1, 1);
+            init.visitEnd();
+
+            cw.visitEnd();
+        });
+    }
+
     private int enumFieldFlags() {
         return Opcodes.ACC_PUBLIC | Opcodes.ACC_STATIC | Opcodes.ACC_FINAL | Opcodes.ACC_ENUM;
     }