JVM_IR no static inline class members for Kotlin JvmDefault methods

KT-43698 KT-43051

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.kt

@@ -0,0 +1,38 @@
+// JVM_TARGET: 1.8
+// FILE: javaDefaultInterfaceMember.kt
+interface KFoo2 : JIFoo
+
+interface KFooUnrelated {
+    fun foo()
+}
+
+interface KFoo3 : KFoo2, KFooUnrelated {
+    override fun foo() {}
+}
+
+interface KBar2 : JIBar
+
+inline class TestFoo1(val x: Int) : JIFoo
+
+inline class TestFoo2(val x: Int) : KFoo2
+
+inline class TestFoo3(val x: Int) : KFoo3
+
+inline class TestBar1(val x: Int) : JIBar {
+    override fun bar() {}
+}
+
+inline class TestBar2(val x: Int) : KBar2 {
+    override fun bar() {}
+}
+
+// FILE: JIFoo.java
+public interface JIFoo {
+    default void foo() {}
+}
+
+// FILE: JIBar.java
+public interface JIBar {
+    default void foo() {}
+    default void bar() {}
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/javaDefaultInterfaceMember.txt

@@ -0,0 +1,130 @@
+@kotlin.Metadata
+public interface KBar2 {
+    // source: 'javaDefaultInterfaceMember.kt'
+}
+
+@kotlin.Metadata
+public interface KFoo2 {
+    // source: 'javaDefaultInterfaceMember.kt'
+}
+
+@kotlin.Metadata
+public final class KFoo3$DefaultImpls {
+    // source: 'javaDefaultInterfaceMember.kt'
+    public static method foo(@org.jetbrains.annotations.NotNull p0: KFoo3): void
+    public final inner class KFoo3$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface KFoo3 {
+    // source: 'javaDefaultInterfaceMember.kt'
+    public abstract method foo(): void
+    public final inner class KFoo3$DefaultImpls
+}
+
+@kotlin.Metadata
+public interface KFooUnrelated {
+    // source: 'javaDefaultInterfaceMember.kt'
+    public abstract method foo(): void
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class TestBar1 {
+    // source: 'javaDefaultInterfaceMember.kt'
+    private final field x: int
+    private synthetic method <init>(p0: int): void
+    public method bar(): void
+    public static method bar-impl(p0: int): void
+    public synthetic final static method box-impl(p0: int): TestBar1
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getX(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class TestBar2 {
+    // source: 'javaDefaultInterfaceMember.kt'
+    private final field x: int
+    private synthetic method <init>(p0: int): void
+    public method bar(): void
+    public static method bar-impl(p0: int): void
+    public synthetic final static method box-impl(p0: int): TestBar2
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getX(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class TestFoo1 {
+    // source: 'javaDefaultInterfaceMember.kt'
+    private final field x: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): TestFoo1
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getX(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class TestFoo2 {
+    // source: 'javaDefaultInterfaceMember.kt'
+    private final field x: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): TestFoo2
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public final method getX(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class TestFoo3 {
+    // source: 'javaDefaultInterfaceMember.kt'
+    private final field x: int
+    private synthetic method <init>(p0: int): void
+    public synthetic final static method box-impl(p0: int): TestFoo3
+    public static method constructor-impl(p0: int): int
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: int, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: int, p1: int): boolean
+    public method foo(): void
+    public static method foo-impl(p0: int): void
+    public final method getX(): int
+    public method hashCode(): int
+    public static method hashCode-impl(p0: int): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: int): java.lang.String
+    public synthetic final method unbox-impl(): int
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll.kt

@@ -0,0 +1,18 @@
+// !JVM_DEFAULT_MODE: all
+// WITH_RUNTIME
+// JVM_TARGET: 1.8
+
+interface IFooBar {
+    fun foo() = "O"
+    fun bar() = "Failed"
+}
+
+interface IFooBar2 : IFooBar
+
+inline class Test1(val k: String): IFooBar {
+    override fun bar(): String = k
+}
+
+inline class Test2(val k: String): IFooBar2 {
+    override fun bar(): String = k
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll.txt

@@ -0,0 +1,53 @@
+@kotlin.Metadata
+public interface IFooBar {
+    // source: 'jvmDefaultAll.kt'
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+}
+
+@kotlin.Metadata
+public interface IFooBar2 {
+    // source: 'jvmDefaultAll.kt'
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test1 {
+    // source: 'jvmDefaultAll.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test1
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test2 {
+    // source: 'jvmDefaultAll.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test2
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultAll_ir.txt

@@ -0,0 +1,53 @@
+@kotlin.Metadata
+public interface IFooBar {
+    // source: 'jvmDefaultAll.kt'
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+}
+
+@kotlin.Metadata
+public interface IFooBar2 {
+    // source: 'jvmDefaultAll.kt'
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test1 {
+    // source: 'jvmDefaultAll.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test1
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test2 {
+    // source: 'jvmDefaultAll.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test2
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.kt

@@ -0,0 +1,18 @@
+// !JVM_DEFAULT_MODE: enable
+// WITH_RUNTIME
+// JVM_TARGET: 1.8
+
+interface IFooBar {
+    @JvmDefault fun foo() = "O"
+    @JvmDefault fun bar() = "Failed"
+}
+
+interface IFooBar2 : IFooBar
+
+inline class Test1(val k: String): IFooBar {
+    override fun bar(): String = k
+}
+
+inline class Test2(val k: String): IFooBar2 {
+    override fun bar(): String = k
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable.txt

@@ -0,0 +1,53 @@
+@kotlin.Metadata
+public interface IFooBar {
+    // source: 'jvmDefaultEnable.kt'
+    public @kotlin.jvm.JvmDefault @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public @kotlin.jvm.JvmDefault @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+}
+
+@kotlin.Metadata
+public interface IFooBar2 {
+    // source: 'jvmDefaultEnable.kt'
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test1 {
+    // source: 'jvmDefaultEnable.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test1
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test2 {
+    // source: 'jvmDefaultEnable.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test2
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}

compiler/testData/codegen/bytecodeListing/inlineClasses/defaultInterfaceMembers/jvmDefaultEnable_ir.txt

@@ -0,0 +1,53 @@
+@kotlin.Metadata
+public interface IFooBar {
+    // source: 'jvmDefaultEnable.kt'
+    public @kotlin.jvm.JvmDefault @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public @kotlin.jvm.JvmDefault @org.jetbrains.annotations.NotNull method foo(): java.lang.String
+}
+
+@kotlin.Metadata
+public interface IFooBar2 {
+    // source: 'jvmDefaultEnable.kt'
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test1 {
+    // source: 'jvmDefaultEnable.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test1
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}
+
+@kotlin.jvm.JvmInline
+@kotlin.Metadata
+public final class Test2 {
+    // source: 'jvmDefaultEnable.kt'
+    private final @org.jetbrains.annotations.NotNull field k: java.lang.String
+    private synthetic method <init>(p0: java.lang.String): void
+    public @org.jetbrains.annotations.NotNull method bar(): java.lang.String
+    public static @org.jetbrains.annotations.NotNull method bar-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public synthetic final static method box-impl(p0: java.lang.String): Test2
+    public static @org.jetbrains.annotations.NotNull method constructor-impl(@org.jetbrains.annotations.NotNull p0: java.lang.String): java.lang.String
+    public method equals(p0: java.lang.Object): boolean
+    public static method equals-impl(p0: java.lang.String, p1: java.lang.Object): boolean
+    public final static method equals-impl0(p0: java.lang.String, p1: java.lang.String): boolean
+    public final @org.jetbrains.annotations.NotNull method getK(): java.lang.String
+    public method hashCode(): int
+    public static method hashCode-impl(p0: java.lang.String): int
+    public method toString(): java.lang.String
+    public static method toString-impl(p0: java.lang.String): java.lang.String
+    public synthetic final method unbox-impl(): java.lang.String
+}