Load Java enums as final classes

In case Java enum has an abstract member, it has the ACC_ABSTRACT flag set in the bytecode. However, we should still load it with final modality to be consistent with Kotlin enums which are always considered final #KT-23426 Fixed
2019-04-05 22:11:37 +02:00
parent 2f003ef545
commit d257285c86
10 changed files with 111 additions and 5 deletions
@@ -0,0 +1,32 @@
+// !LANGUAGE: +MultiPlatformProjects
+// MODULE: m1-common
+// FILE: common.kt
+expect enum class Foo {
+    ENTRY
+}
+
+expect enum class _TimeUnit
+
+// MODULE: m2-jvm(m1-common)
+// FILE: jvm.kt
+actual typealias Foo = FooImpl
+
+actual typealias _TimeUnit = java.util.concurrent.TimeUnit
+
+// FILE: FooImpl.java
+public enum FooImpl {
+    ENTRY("OK") {
+        @Override
+        public String getResult() {
+            return value;
+        }
+    };
+
+    protected final String value;
+
+    public FooImpl(String value) {
+        this.value = value;
+    }
+
+    public abstract String getResult();
+}
@@ -0,0 +1,59 @@
+// -- Module: <m1-common> --
+package
+
+public final expect enum class Foo : kotlin.Enum<Foo> {
+    expect enum entry ENTRY
+
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: Foo): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): Foo
+    public final /*synthesized*/ fun values(): kotlin.Array<Foo>
+}
+
+public final expect enum class _TimeUnit : kotlin.Enum<_TimeUnit> {
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: _TimeUnit): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): _TimeUnit
+    public final /*synthesized*/ fun values(): kotlin.Array<_TimeUnit>
+}
+
+
+// -- Module: <m2-jvm> --
+package
+
+public final enum class FooImpl : kotlin.Enum<FooImpl!> {
+    enum entry ENTRY
+
+    public constructor FooImpl(/*0*/ value: kotlin.String!)
+    public final override /*1*/ /*fake_override*/ val name: kotlin.String
+    public final override /*1*/ /*fake_override*/ val ordinal: kotlin.Int
+    protected/*protected and package*/ final val value: kotlin.String!
+    protected final override /*1*/ /*fake_override*/ fun clone(): kotlin.Any
+    public final override /*1*/ /*fake_override*/ fun compareTo(/*0*/ other: FooImpl!): kotlin.Int
+    public final override /*1*/ /*fake_override*/ fun equals(/*0*/ other: kotlin.Any?): kotlin.Boolean
+    protected/*protected and package*/ final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun finalize(): kotlin.Unit
+    public final override /*1*/ /*fake_override*/ /*isHiddenForResolutionEverywhereBesideSupercalls*/ fun getDeclaringClass(): java.lang.Class<FooImpl!>!
+    public abstract fun getResult(): kotlin.String!
+    public final override /*1*/ /*fake_override*/ fun hashCode(): kotlin.Int
+    public open override /*1*/ /*fake_override*/ fun toString(): kotlin.String
+
+    // Static members
+    public final /*synthesized*/ fun valueOf(/*0*/ value: kotlin.String): FooImpl
+    public final /*synthesized*/ fun values(): kotlin.Array<FooImpl>
+}
+public actual typealias Foo = FooImpl
+public actual typealias _TimeUnit = java.util.concurrent.TimeUnit