[KLIB tool] Update KLIB metadata dump tests

^KT-62340

native/native.tests/testData/klib/dump-metadata/Accessors.fir.txt

@@ -0,0 +1,52 @@
+library {
+  // module name: <Accessors.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/A
+    // class name: custom/pkg/Foo
+
+    public final annotation class custom/pkg/A : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      public constructor()
+
+      @custom/pkg/A
+      public final val annotated: kotlin/Int /* = 0 */
+        public final get
+
+      public final var annotatedAccessors: kotlin/Int
+        @custom/pkg/A
+        public final /* non-default */ get
+        @custom/pkg/A
+        public final /* non-default */ set(value: kotlin/Int)
+
+      public final val annotatedGetter: kotlin/Int /* = 0 */
+        @custom/pkg/A
+        public final /* non-default */ get
+
+      public final var annotatedSetter: kotlin/Int
+        public final get
+        @custom/pkg/A
+        public final /* non-default */ set(value: kotlin/Int)
+
+      public final var privateSetter: kotlin/Int
+        public final get
+        private final /* non-default */ set(value: kotlin/Int)
+
+      private final val privateSimple: kotlin/Int /* = 0 */
+        private final get
+
+      protected final val protectedSimple: kotlin/Int /* = 0 */
+        protected final get
+
+      public final val simple: kotlin/Int /* = 0 */
+        public final get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Accessors.txt

@@ -1,17 +1,52 @@
-package custom.pkg {
-    annotation class A constructor() : Annotation
-    class Foo constructor() {
-        @A val annotated: Int = 0
-        var annotatedAccessors: Int
-            @A get
-            @A set
-        val annotatedGetter: Int = 0
-            @A get
-        var annotatedSetter: Int
-            @A set
-        var privateSetter: Int
-            private set
-        protected val protectedSimple: Int = 0
-        val simple: Int = 0
+library {
+  // module name: <Accessors.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/A
+    // class name: custom/pkg/Foo
+
+    public final annotation class custom/pkg/A : kotlin/Annotation {
+
+      public constructor()
     }
-}
+
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      public constructor()
+
+      @custom/pkg/A
+      public final val annotated: kotlin/Int /* = 0 */
+        public final get
+
+      public final var annotatedAccessors: kotlin/Int
+        @custom/pkg/A
+        public final /* non-default */ get
+        @custom/pkg/A
+        public final /* non-default */ set(<set-?>: kotlin/Int)
+
+      public final val annotatedGetter: kotlin/Int /* = 0 */
+        @custom/pkg/A
+        public final /* non-default */ get
+
+      public final var annotatedSetter: kotlin/Int
+        public final get
+        @custom/pkg/A
+        public final /* non-default */ set(<set-?>: kotlin/Int)
+
+      public final var privateSetter: kotlin/Int
+        public final get
+        private final /* non-default */ set(<set-?>: kotlin/Int)
+
+      private final val privateSimple: kotlin/Int /* = 0 */
+        private final get
+
+      protected final val protectedSimple: kotlin/Int /* = 0 */
+        protected final get
+
+      public final val simple: kotlin/Int /* = 0 */
+        public final get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Accessors.v1.fir.txt

@@ -0,0 +1,75 @@
+library {
+  // module name: <Accessors.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/A
+    // class name: custom/pkg/Foo
+
+    // signature: custom.pkg/A|null[0]
+    public final annotation class custom/pkg/A : kotlin/Annotation {
+
+      // signature: custom.pkg/A.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: custom.pkg/Foo|null[0]
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      // signature: custom.pkg/Foo.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: custom.pkg/Foo.annotated|4796959806228949141[0]
+      @custom/pkg/A
+      public final val annotated: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotated.<get-annotated>|8560369092635518301[0]
+        public final get
+
+      // signature: custom.pkg/Foo.annotatedAccessors|-2696733316289958808[0]
+      public final var annotatedAccessors: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedAccessors.<get-annotatedAccessors>|1622120395968958718[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+        // signature: custom.pkg/Foo.annotatedAccessors.<set-annotatedAccessors>|-2659697716788262479[0]
+        @custom/pkg/A
+        public final /* non-default */ set(value: kotlin/Int)
+
+      // signature: custom.pkg/Foo.annotatedGetter|2662566077187940730[0]
+      public final val annotatedGetter: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotatedGetter.<get-annotatedGetter>|811214482955708703[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+
+      // signature: custom.pkg/Foo.annotatedSetter|-2080041549422472915[0]
+      public final var annotatedSetter: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedSetter.<get-annotatedSetter>|-3803695636622870963[0]
+        public final get
+        // signature: custom.pkg/Foo.annotatedSetter.<set-annotatedSetter>|4219770012469820688[0]
+        @custom/pkg/A
+        public final /* non-default */ set(value: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSetter|-7367207755766039228[0]
+      public final var privateSetter: kotlin/Int
+        // signature: custom.pkg/Foo.privateSetter.<get-privateSetter>|-1955517508082257126[0]
+        public final get
+        // signature: custom.pkg/Foo.privateSetter.<set-privateSetter>|-2122183718828263324[0]
+        private final /* non-default */ set(value: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSimple|-6462896533882242463[0]
+      private final val privateSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.privateSimple.<get-privateSimple>|-7951279747362169535[0]
+        private final get
+
+      // signature: custom.pkg/Foo.protectedSimple|8596646478392887235[0]
+      protected final val protectedSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.protectedSimple.<get-protectedSimple>|-7535435137848975023[0]
+        protected final get
+
+      // signature: custom.pkg/Foo.simple|1899398506587500007[0]
+      public final val simple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.simple.<get-simple>|-1948492533687709865[0]
+        public final get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Accessors.v1.txt

@@ -1,31 +1,75 @@
-package custom.pkg {
-    // Signature: custom.pkg/A|null[0]
-    annotation class A constructor() : Annotation
-    // Signature: custom.pkg/Foo|null[0]
-    class Foo constructor() {
-        // Signature: custom.pkg/Foo.annotated|4796959806228949141[0]
-        @A val annotated: Int = 0
-        // Signature: custom.pkg/Foo.annotatedAccessors|-2696733316289958808[0]
-        var annotatedAccessors: Int
-            // Signature: custom.pkg/Foo.annotatedAccessors.<get-annotatedAccessors>|1622120395968958718[0]
-            @A get
-            // Signature: custom.pkg/Foo.annotatedAccessors.<set-annotatedAccessors>|-2659697716788262479[0]
-            @A set
-        // Signature: custom.pkg/Foo.annotatedGetter|2662566077187940730[0]
-        val annotatedGetter: Int = 0
-            // Signature: custom.pkg/Foo.annotatedGetter.<get-annotatedGetter>|811214482955708703[0]
-            @A get
-        // Signature: custom.pkg/Foo.annotatedSetter|-2080041549422472915[0]
-        var annotatedSetter: Int
-            // Signature: custom.pkg/Foo.annotatedSetter.<set-annotatedSetter>|4219770012469820688[0]
-            @A set
-        // Signature: custom.pkg/Foo.privateSetter|-7367207755766039228[0]
-        var privateSetter: Int
-            // Signature: custom.pkg/Foo.privateSetter.<set-privateSetter>|-2122183718828263324[0]
-            private set
-        // Signature: custom.pkg/Foo.protectedSimple|8596646478392887235[0]
-        protected val protectedSimple: Int = 0
-        // Signature: custom.pkg/Foo.simple|1899398506587500007[0]
-        val simple: Int = 0
+library {
+  // module name: <Accessors.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/A
+    // class name: custom/pkg/Foo
+
+    // signature: custom.pkg/A|null[0]
+    public final annotation class custom/pkg/A : kotlin/Annotation {
+
+      // signature: custom.pkg/A.<init>|-5645683436151566731[0]
+      public constructor()
     }
+
+    // signature: custom.pkg/Foo|null[0]
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      // signature: custom.pkg/Foo.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: custom.pkg/Foo.annotated|4796959806228949141[0]
+      @custom/pkg/A
+      public final val annotated: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotated.<get-annotated>|8560369092635518301[0]
+        public final get
+
+      // signature: custom.pkg/Foo.annotatedAccessors|-2696733316289958808[0]
+      public final var annotatedAccessors: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedAccessors.<get-annotatedAccessors>|1622120395968958718[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+        // signature: custom.pkg/Foo.annotatedAccessors.<set-annotatedAccessors>|-2659697716788262479[0]
+        @custom/pkg/A
+        public final /* non-default */ set(<set-?>: kotlin/Int)
+
+      // signature: custom.pkg/Foo.annotatedGetter|2662566077187940730[0]
+      public final val annotatedGetter: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotatedGetter.<get-annotatedGetter>|811214482955708703[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+
+      // signature: custom.pkg/Foo.annotatedSetter|-2080041549422472915[0]
+      public final var annotatedSetter: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedSetter.<get-annotatedSetter>|-3803695636622870963[0]
+        public final get
+        // signature: custom.pkg/Foo.annotatedSetter.<set-annotatedSetter>|4219770012469820688[0]
+        @custom/pkg/A
+        public final /* non-default */ set(<set-?>: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSetter|-7367207755766039228[0]
+      public final var privateSetter: kotlin/Int
+        // signature: custom.pkg/Foo.privateSetter.<get-privateSetter>|-1955517508082257126[0]
+        public final get
+        // signature: custom.pkg/Foo.privateSetter.<set-privateSetter>|-2122183718828263324[0]
+        private final /* non-default */ set(<set-?>: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSimple|-6462896533882242463[0]
+      private final val privateSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.privateSimple.<get-privateSimple>|-7951279747362169535[0]
+        private final get
+
+      // signature: custom.pkg/Foo.protectedSimple|8596646478392887235[0]
+      protected final val protectedSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.protectedSimple.<get-protectedSimple>|-7535435137848975023[0]
+        protected final get
+
+      // signature: custom.pkg/Foo.simple|1899398506587500007[0]
+      public final val simple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.simple.<get-simple>|-1948492533687709865[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Accessors.v2.fir.txt

@@ -0,0 +1,75 @@
+library {
+  // module name: <Accessors.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/A
+    // class name: custom/pkg/Foo
+
+    // signature: custom.pkg/A|null[0]
+    public final annotation class custom/pkg/A : kotlin/Annotation {
+
+      // signature: custom.pkg/A.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: custom.pkg/Foo|null[0]
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      // signature: custom.pkg/Foo.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: custom.pkg/Foo.annotated|{}annotated[0]
+      @custom/pkg/A
+      public final val annotated: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotated.<get-annotated>|<get-annotated>(){}[0]
+        public final get
+
+      // signature: custom.pkg/Foo.annotatedAccessors|{}annotatedAccessors[0]
+      public final var annotatedAccessors: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedAccessors.<get-annotatedAccessors>|<get-annotatedAccessors>(){}[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+        // signature: custom.pkg/Foo.annotatedAccessors.<set-annotatedAccessors>|<set-annotatedAccessors>(kotlin.Int){}[0]
+        @custom/pkg/A
+        public final /* non-default */ set(value: kotlin/Int)
+
+      // signature: custom.pkg/Foo.annotatedGetter|{}annotatedGetter[0]
+      public final val annotatedGetter: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotatedGetter.<get-annotatedGetter>|<get-annotatedGetter>(){}[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+
+      // signature: custom.pkg/Foo.annotatedSetter|{}annotatedSetter[0]
+      public final var annotatedSetter: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedSetter.<get-annotatedSetter>|<get-annotatedSetter>(){}[0]
+        public final get
+        // signature: custom.pkg/Foo.annotatedSetter.<set-annotatedSetter>|<set-annotatedSetter>(kotlin.Int){}[0]
+        @custom/pkg/A
+        public final /* non-default */ set(value: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSetter|{}privateSetter[0]
+      public final var privateSetter: kotlin/Int
+        // signature: custom.pkg/Foo.privateSetter.<get-privateSetter>|<get-privateSetter>(){}[0]
+        public final get
+        // signature: custom.pkg/Foo.privateSetter.<set-privateSetter>|<set-privateSetter>(kotlin.Int){}[0]
+        private final /* non-default */ set(value: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSimple|{}privateSimple[0]
+      private final val privateSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.privateSimple.<get-privateSimple>|<get-privateSimple>(){}[0]
+        private final get
+
+      // signature: custom.pkg/Foo.protectedSimple|{}protectedSimple[0]
+      protected final val protectedSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.protectedSimple.<get-protectedSimple>|<get-protectedSimple>(){}[0]
+        protected final get
+
+      // signature: custom.pkg/Foo.simple|{}simple[0]
+      public final val simple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.simple.<get-simple>|<get-simple>(){}[0]
+        public final get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Accessors.v2.txt

@@ -1,31 +1,75 @@
-package custom.pkg {
-    // Signature: custom.pkg/A|null[0]
-    annotation class A constructor() : Annotation
-    // Signature: custom.pkg/Foo|null[0]
-    class Foo constructor() {
-        // Signature: custom.pkg/Foo.annotated|{}annotated[0]
-        @A val annotated: Int = 0
-        // Signature: custom.pkg/Foo.annotatedAccessors|{}annotatedAccessors[0]
-        var annotatedAccessors: Int
-            // Signature: custom.pkg/Foo.annotatedAccessors.<get-annotatedAccessors>|<get-annotatedAccessors>(){}[0]
-            @A get
-            // Signature: custom.pkg/Foo.annotatedAccessors.<set-annotatedAccessors>|<set-annotatedAccessors>(kotlin.Int){}[0]
-            @A set
-        // Signature: custom.pkg/Foo.annotatedGetter|{}annotatedGetter[0]
-        val annotatedGetter: Int = 0
-            // Signature: custom.pkg/Foo.annotatedGetter.<get-annotatedGetter>|<get-annotatedGetter>(){}[0]
-            @A get
-        // Signature: custom.pkg/Foo.annotatedSetter|{}annotatedSetter[0]
-        var annotatedSetter: Int
-            // Signature: custom.pkg/Foo.annotatedSetter.<set-annotatedSetter>|<set-annotatedSetter>(kotlin.Int){}[0]
-            @A set
-        // Signature: custom.pkg/Foo.privateSetter|{}privateSetter[0]
-        var privateSetter: Int
-            // Signature: custom.pkg/Foo.privateSetter.<set-privateSetter>|<set-privateSetter>(kotlin.Int){}[0]
-            private set
-        // Signature: custom.pkg/Foo.protectedSimple|{}protectedSimple[0]
-        protected val protectedSimple: Int = 0
-        // Signature: custom.pkg/Foo.simple|{}simple[0]
-        val simple: Int = 0
+library {
+  // module name: <Accessors.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/A
+    // class name: custom/pkg/Foo
+
+    // signature: custom.pkg/A|null[0]
+    public final annotation class custom/pkg/A : kotlin/Annotation {
+
+      // signature: custom.pkg/A.<init>|<init>(){}[0]
+      public constructor()
     }
+
+    // signature: custom.pkg/Foo|null[0]
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      // signature: custom.pkg/Foo.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: custom.pkg/Foo.annotated|{}annotated[0]
+      @custom/pkg/A
+      public final val annotated: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotated.<get-annotated>|<get-annotated>(){}[0]
+        public final get
+
+      // signature: custom.pkg/Foo.annotatedAccessors|{}annotatedAccessors[0]
+      public final var annotatedAccessors: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedAccessors.<get-annotatedAccessors>|<get-annotatedAccessors>(){}[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+        // signature: custom.pkg/Foo.annotatedAccessors.<set-annotatedAccessors>|<set-annotatedAccessors>(kotlin.Int){}[0]
+        @custom/pkg/A
+        public final /* non-default */ set(<set-?>: kotlin/Int)
+
+      // signature: custom.pkg/Foo.annotatedGetter|{}annotatedGetter[0]
+      public final val annotatedGetter: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.annotatedGetter.<get-annotatedGetter>|<get-annotatedGetter>(){}[0]
+        @custom/pkg/A
+        public final /* non-default */ get
+
+      // signature: custom.pkg/Foo.annotatedSetter|{}annotatedSetter[0]
+      public final var annotatedSetter: kotlin/Int
+        // signature: custom.pkg/Foo.annotatedSetter.<get-annotatedSetter>|<get-annotatedSetter>(){}[0]
+        public final get
+        // signature: custom.pkg/Foo.annotatedSetter.<set-annotatedSetter>|<set-annotatedSetter>(kotlin.Int){}[0]
+        @custom/pkg/A
+        public final /* non-default */ set(<set-?>: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSetter|{}privateSetter[0]
+      public final var privateSetter: kotlin/Int
+        // signature: custom.pkg/Foo.privateSetter.<get-privateSetter>|<get-privateSetter>(){}[0]
+        public final get
+        // signature: custom.pkg/Foo.privateSetter.<set-privateSetter>|<set-privateSetter>(kotlin.Int){}[0]
+        private final /* non-default */ set(<set-?>: kotlin/Int)
+
+      // signature: custom.pkg/Foo.privateSimple|{}privateSimple[0]
+      private final val privateSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.privateSimple.<get-privateSimple>|<get-privateSimple>(){}[0]
+        private final get
+
+      // signature: custom.pkg/Foo.protectedSimple|{}protectedSimple[0]
+      protected final val protectedSimple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.protectedSimple.<get-protectedSimple>|<get-protectedSimple>(){}[0]
+        protected final get
+
+      // signature: custom.pkg/Foo.simple|{}simple[0]
+      public final val simple: kotlin/Int /* = 0 */
+        // signature: custom.pkg/Foo.simple.<get-simple>|<get-simple>(){}[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Classes.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class A {
     fun aFun() {}
     val aVal = 0

native/native.tests/testData/klib/dump-metadata/Classes.txt

@@ -1,48 +1,161 @@
-package <root> {
-    class A constructor() {
-        val aVal: Int = 0
-        var aVar: String
-        fun aFun()
-        inner class B constructor() {
-            val bVal: Int = 0
-            var bVar: String
-            fun bFun()
-            inner class C constructor() {
-                val cVal: Int = 0
-                var cVar: String
-                fun cFun()
-            }
-        }
-        class E constructor() {
-            val eVal: Int = 0
-            var eVar: String
-            fun eFun()
-        }
+library {
+  // module name: <Classes.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: A.B
+    // class name: A.B.C
+    // class name: A.B.D
+    // class name: A.E
+    // class name: F
+    // class name: FinalImpl
+    // class name: Interface
+    // class name: OpenImpl
+
+    public final class A : kotlin/Any {
+
+      public constructor()
+
+      public final fun aFun(): kotlin/Unit
+
+      public final val aVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var aVar: kotlin/String
+        public final get
+        public final set
+
+      // nested class: B
+
+      // nested class: E
     }
-    data class F constructor(fVal: Int, fVar: String) {
-        val fVal: Int
-        var fVar: String
-        operator fun component1(): Int
-        operator fun component2(): String
-        fun copy(fVal: Int = ..., fVar: String = ...): F
-        override fun equals(other: Any?): Boolean
-        fun fFun()
-        override fun hashCode(): Int
-        override fun toString(): String
+
+    public final inner class A.B : kotlin/Any {
+
+      public constructor()
+
+      public final fun bFun(): kotlin/Unit
+
+      public final val bVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var bVar: kotlin/String
+        public final get
+        public final set
+
+      // nested class: C
+
+      // nested class: D
     }
-    class FinalImpl constructor() : OpenImpl {
-        override val iVal: Int = 0
-        override var iVar: String
-        override fun iFun()
+
+    public final inner class A.B.C : kotlin/Any {
+
+      public constructor()
+
+      public final fun cFun(): kotlin/Unit
+
+      public final val cVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var cVar: kotlin/String
+        public final get
+        public final set
     }
-    interface Interface {
-        val iVal: Int
-        var iVar: String
-        fun iFun()
+
+    private final inner class A.B.D : kotlin/Any {
+
+      public constructor()
+
+      public final fun dFun(): kotlin/Unit
+
+      public final val dVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var dVar: kotlin/String
+        public final get
+        public final set
     }
-    open class OpenImpl constructor() : Interface {
-        override val iVal: Int = 0
-        override var iVar: String
-        override fun iFun()
+
+    public final class A.E : kotlin/Any {
+
+      public constructor()
+
+      public final fun eFun(): kotlin/Unit
+
+      public final val eVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var eVar: kotlin/String
+        public final get
+        public final set
     }
-}
+
+    public final data class F : kotlin/Any {
+
+      public constructor(fVal: kotlin/Int, fVar: kotlin/String)
+
+      public final /* synthesized */ operator fun component1(): kotlin/Int
+
+      public final /* synthesized */ operator fun component2(): kotlin/String
+
+      public final /* synthesized */ fun copy(fVal: kotlin/Int /* = ... */, fVar: kotlin/String /* = ... */): F
+
+      public open /* synthesized */ operator fun equals(other: kotlin/Any?): kotlin/Boolean
+
+      public final fun fFun(): kotlin/Unit
+
+      public open /* synthesized */ fun hashCode(): kotlin/Int
+
+      public open /* synthesized */ fun toString(): kotlin/String
+
+      public final val fVal: kotlin/Int
+        public final get
+
+      public final var fVar: kotlin/String
+        public final get
+        public final set
+    }
+
+    public final class FinalImpl : OpenImpl {
+
+      public constructor()
+
+      public open fun iFun(): kotlin/Unit
+
+      public open val iVal: kotlin/Int /* = 0 */
+        public open get
+
+      public open var iVar: kotlin/String
+        public open get
+        public open set
+    }
+
+    public abstract interface Interface : kotlin/Any {
+
+      public abstract fun iFun(): kotlin/Unit
+
+      public abstract val iVal: kotlin/Int
+        public abstract get
+
+      public abstract var iVar: kotlin/String
+        public abstract get
+        public abstract set
+    }
+
+    public open class OpenImpl : Interface {
+
+      public constructor()
+
+      public open fun iFun(): kotlin/Unit
+
+      public open val iVal: kotlin/Int /* = 0 */
+        public open get
+
+      public open var iVar: kotlin/String
+        public open get
+        public open set
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Classes.v1.txt

@@ -1,86 +1,238 @@
-package <root> {
-    // Signature: /A|null[0]
-    class A constructor() {
-        // Signature: /A.aVal|-4026160909590410018[0]
-        val aVal: Int = 0
-        // Signature: /A.aVar|3814694652979924453[0]
-        var aVar: String
-        // Signature: /A.aFun|-596272525427331003[0]
-        fun aFun()
-        // Signature: /A.B|null[0]
-        inner class B constructor() {
-            // Signature: /A.B.bVal|47661200932476778[0]
-            val bVal: Int = 0
-            // Signature: /A.B.bVar|1733087153451115465[0]
-            var bVar: String
-            // Signature: /A.B.bFun|4199274722730592230[0]
-            fun bFun()
-            // Signature: /A.B.C|null[0]
-            inner class C constructor() {
-                // Signature: /A.B.C.cVal|5776604707001436517[0]
-                val cVal: Int = 0
-                // Signature: /A.B.C.cVar|-6552073779725328843[0]
-                var cVar: String
-                // Signature: /A.B.C.cFun|5963622644484500428[0]
-                fun cFun()
-            }
-        }
-        // Signature: /A.E|null[0]
-        class E constructor() {
-            // Signature: /A.E.eVal|3045358633348092364[0]
-            val eVal: Int = 0
-            // Signature: /A.E.eVar|3111249734155596017[0]
-            var eVar: String
-            // Signature: /A.E.eFun|3495051381223408264[0]
-            fun eFun()
-        }
+library {
+  // module name: <Classes.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: A.B
+    // class name: A.B.C
+    // class name: A.B.D
+    // class name: A.E
+    // class name: F
+    // class name: FinalImpl
+    // class name: Interface
+    // class name: OpenImpl
+
+    // signature: /A|null[0]
+    public final class A : kotlin/Any {
+
+      // signature: /A.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /A.aFun|-596272525427331003[0]
+      public final fun aFun(): kotlin/Unit
+
+      // signature: /A.aVal|-4026160909590410018[0]
+      public final val aVal: kotlin/Int /* = 0 */
+        // signature: /A.aVal.<get-aVal>|1133261762939420636[0]
+        public final get
+
+      // signature: /A.aVar|3814694652979924453[0]
+      public final var aVar: kotlin/String
+        // signature: /A.aVar.<get-aVar>|643049459261948719[0]
+        public final get
+        // signature: /A.aVar.<set-aVar>|-3684581426018096880[0]
+        public final set
+
+      // nested class: B
+
+      // nested class: E
     }
-    // Signature: /F|null[0]
-    data class F constructor(fVal: Int, fVar: String) {
-        // Signature: /F.fVal|6893318909478774212[0]
-        val fVal: Int
-        // Signature: /F.fVar|-2983039959624530436[0]
-        var fVar: String
-        // Signature: /F.component1|162597135895221648[0]
-        operator fun component1(): Int
-        // Signature: /F.component2|3796717572321500973[0]
-        operator fun component2(): String
-        // Signature: /F.copy|5893098757611139585[0]
-        fun copy(fVal: Int = ..., fVar: String = ...): F
-        // Signature: /F.equals|4638265728071529943[0]
-        override fun equals(other: Any?): Boolean
-        // Signature: /F.fFun|2647324645836040292[0]
-        fun fFun()
-        // Signature: /F.hashCode|3409210261493131192[0]
-        override fun hashCode(): Int
-        // Signature: /F.toString|-1522858123163872138[0]
-        override fun toString(): String
+
+    // signature: /A.B|null[0]
+    public final inner class A.B : kotlin/Any {
+
+      // signature: /A.B.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /A.B.bFun|4199274722730592230[0]
+      public final fun bFun(): kotlin/Unit
+
+      // signature: /A.B.bVal|47661200932476778[0]
+      public final val bVal: kotlin/Int /* = 0 */
+        // signature: /A.B.bVal.<get-bVal>|4280762573327915998[0]
+        public final get
+
+      // signature: /A.B.bVar|1733087153451115465[0]
+      public final var bVar: kotlin/String
+        // signature: /A.B.bVar.<get-bVar>|-3999248274667876256[0]
+        public final get
+        // signature: /A.B.bVar.<set-bVar>|-4825376880140249283[0]
+        public final set
+
+      // nested class: C
+
+      // nested class: D
     }
-    // Signature: /FinalImpl|null[0]
-    class FinalImpl constructor() : OpenImpl {
-        // Signature: /FinalImpl.iVal|-7454916029695635493[0]
-        override val iVal: Int = 0
-        // Signature: /FinalImpl.iVar|5660235026806079480[0]
-        override var iVar: String
-        // Signature: /FinalImpl.iFun|-7944844664160120593[0]
-        override fun iFun()
+
+    // signature: /A.B.C|null[0]
+    public final inner class A.B.C : kotlin/Any {
+
+      // signature: /A.B.C.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /A.B.C.cFun|5963622644484500428[0]
+      public final fun cFun(): kotlin/Unit
+
+      // signature: /A.B.C.cVal|5776604707001436517[0]
+      public final val cVal: kotlin/Int /* = 0 */
+        // signature: /A.B.C.cVal.<get-cVal>|3075094094508885184[0]
+        public final get
+
+      // signature: /A.B.C.cVar|-6552073779725328843[0]
+      public final var cVar: kotlin/String
+        // signature: /A.B.C.cVar.<get-cVar>|1091296143631960810[0]
+        public final get
+        // signature: /A.B.C.cVar.<set-cVar>|6166431973776537982[0]
+        public final set
     }
-    // Signature: /Interface|null[0]
-    interface Interface {
-        // Signature: /Interface.iVal|-7454916029695635493[0]
-        val iVal: Int
-        // Signature: /Interface.iVar|5660235026806079480[0]
-        var iVar: String
-        // Signature: /Interface.iFun|-7944844664160120593[0]
-        fun iFun()
+
+    // signature: /A.B.D|null[0]
+    private final inner class A.B.D : kotlin/Any {
+
+      // signature: /A.B.D.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /A.B.D.dFun|-875776255063369523[0]
+      public final fun dFun(): kotlin/Unit
+
+      // signature: /A.B.D.dVal|-4657921206489813306[0]
+      public final val dVal: kotlin/Int /* = 0 */
+        // signature: /A.B.D.dVal.<get-dVal>|8462599572645632105[0]
+        public final get
+
+      // signature: /A.B.D.dVar|-4302662149706586937[0]
+      public final var dVar: kotlin/String
+        // signature: /A.B.D.dVar.<get-dVar>|5843434698909708981[0]
+        public final get
+        // signature: /A.B.D.dVar.<set-dVar>|-8291764058292932666[0]
+        public final set
     }
-    // Signature: /OpenImpl|null[0]
-    open class OpenImpl constructor() : Interface {
-        // Signature: /OpenImpl.iVal|-7454916029695635493[0]
-        override val iVal: Int = 0
-        // Signature: /OpenImpl.iVar|5660235026806079480[0]
-        override var iVar: String
-        // Signature: /OpenImpl.iFun|-7944844664160120593[0]
-        override fun iFun()
+
+    // signature: /A.E|null[0]
+    public final class A.E : kotlin/Any {
+
+      // signature: /A.E.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /A.E.eFun|3495051381223408264[0]
+      public final fun eFun(): kotlin/Unit
+
+      // signature: /A.E.eVal|3045358633348092364[0]
+      public final val eVal: kotlin/Int /* = 0 */
+        // signature: /A.E.eVal.<get-eVal>|5614868761266169748[0]
+        public final get
+
+      // signature: /A.E.eVar|3111249734155596017[0]
+      public final var eVar: kotlin/String
+        // signature: /A.E.eVar.<get-eVar>|-6537729739637652536[0]
+        public final get
+        // signature: /A.E.eVar.<set-eVar>|-1170683713879761253[0]
+        public final set
     }
+
+    // signature: /F|null[0]
+    public final data class F : kotlin/Any {
+
+      // signature: /F.<init>|-6994814679185246063[0]
+      public constructor(fVal: kotlin/Int, fVar: kotlin/String)
+
+      // signature: /F.component1|162597135895221648[0]
+      public final /* synthesized */ operator fun component1(): kotlin/Int
+
+      // signature: /F.component2|3796717572321500973[0]
+      public final /* synthesized */ operator fun component2(): kotlin/String
+
+      // signature: /F.copy|5893098757611139585[0]
+      public final /* synthesized */ fun copy(fVal: kotlin/Int /* = ... */, fVar: kotlin/String /* = ... */): F
+
+      // signature: /F.equals|4638265728071529943[0]
+      public open /* synthesized */ operator fun equals(other: kotlin/Any?): kotlin/Boolean
+
+      // signature: /F.fFun|2647324645836040292[0]
+      public final fun fFun(): kotlin/Unit
+
+      // signature: /F.hashCode|3409210261493131192[0]
+      public open /* synthesized */ fun hashCode(): kotlin/Int
+
+      // signature: /F.toString|-1522858123163872138[0]
+      public open /* synthesized */ fun toString(): kotlin/String
+
+      // signature: /F.fVal|6893318909478774212[0]
+      public final val fVal: kotlin/Int
+        // signature: /F.fVal.<get-fVal>|4437215135741003892[0]
+        public final get
+
+      // signature: /F.fVar|-2983039959624530436[0]
+      public final var fVar: kotlin/String
+        // signature: /F.fVar.<get-fVar>|3603103252422838880[0]
+        public final get
+        // signature: /F.fVar.<set-fVar>|2951263171025328798[0]
+        public final set
+    }
+
+    // signature: /FinalImpl|null[0]
+    public final class FinalImpl : OpenImpl {
+
+      // signature: /FinalImpl.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /FinalImpl.iFun|-7944844664160120593[0]
+      public open fun iFun(): kotlin/Unit
+
+      // signature: /FinalImpl.iVal|-7454916029695635493[0]
+      public open val iVal: kotlin/Int /* = 0 */
+        // signature: /FinalImpl.iVal.<get-iVal>|3700448028516726757[0]
+        public open get
+
+      // signature: /FinalImpl.iVar|5660235026806079480[0]
+      public open var iVar: kotlin/String
+        // signature: /FinalImpl.iVar.<get-iVar>|-2407059627731632582[0]
+        public open get
+        // signature: /FinalImpl.iVar.<set-iVar>|1731789752263997975[0]
+        public open set
+    }
+
+    // signature: /Interface|null[0]
+    public abstract interface Interface : kotlin/Any {
+
+      // signature: /Interface.iFun|-7944844664160120593[0]
+      public abstract fun iFun(): kotlin/Unit
+
+      // signature: /Interface.iVal|-7454916029695635493[0]
+      public abstract val iVal: kotlin/Int
+        // signature: /Interface.iVal.<get-iVal>|3700448028516726757[0]
+        public abstract get
+
+      // signature: /Interface.iVar|5660235026806079480[0]
+      public abstract var iVar: kotlin/String
+        // signature: /Interface.iVar.<get-iVar>|-2407059627731632582[0]
+        public abstract get
+        // signature: /Interface.iVar.<set-iVar>|1731789752263997975[0]
+        public abstract set
+    }
+
+    // signature: /OpenImpl|null[0]
+    public open class OpenImpl : Interface {
+
+      // signature: /OpenImpl.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /OpenImpl.iFun|-7944844664160120593[0]
+      public open fun iFun(): kotlin/Unit
+
+      // signature: /OpenImpl.iVal|-7454916029695635493[0]
+      public open val iVal: kotlin/Int /* = 0 */
+        // signature: /OpenImpl.iVal.<get-iVal>|3700448028516726757[0]
+        public open get
+
+      // signature: /OpenImpl.iVar|5660235026806079480[0]
+      public open var iVar: kotlin/String
+        // signature: /OpenImpl.iVar.<get-iVar>|-2407059627731632582[0]
+        public open get
+        // signature: /OpenImpl.iVar.<set-iVar>|1731789752263997975[0]
+        public open set
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Classes.v2.txt

@@ -1,86 +1,238 @@
-package <root> {
-    // Signature: /A|null[0]
-    class A constructor() {
-        // Signature: /A.aVal|{}aVal[0]
-        val aVal: Int = 0
-        // Signature: /A.aVar|{}aVar[0]
-        var aVar: String
-        // Signature: /A.aFun|aFun(){}[0]
-        fun aFun()
-        // Signature: /A.B|null[0]
-        inner class B constructor() {
-            // Signature: /A.B.bVal|{}bVal[0]
-            val bVal: Int = 0
-            // Signature: /A.B.bVar|{}bVar[0]
-            var bVar: String
-            // Signature: /A.B.bFun|bFun(){}[0]
-            fun bFun()
-            // Signature: /A.B.C|null[0]
-            inner class C constructor() {
-                // Signature: /A.B.C.cVal|{}cVal[0]
-                val cVal: Int = 0
-                // Signature: /A.B.C.cVar|{}cVar[0]
-                var cVar: String
-                // Signature: /A.B.C.cFun|cFun(){}[0]
-                fun cFun()
-            }
-        }
-        // Signature: /A.E|null[0]
-        class E constructor() {
-            // Signature: /A.E.eVal|{}eVal[0]
-            val eVal: Int = 0
-            // Signature: /A.E.eVar|{}eVar[0]
-            var eVar: String
-            // Signature: /A.E.eFun|eFun(){}[0]
-            fun eFun()
-        }
+library {
+  // module name: <Classes.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: A.B
+    // class name: A.B.C
+    // class name: A.B.D
+    // class name: A.E
+    // class name: F
+    // class name: FinalImpl
+    // class name: Interface
+    // class name: OpenImpl
+
+    // signature: /A|null[0]
+    public final class A : kotlin/Any {
+
+      // signature: /A.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /A.aFun|aFun(){}[0]
+      public final fun aFun(): kotlin/Unit
+
+      // signature: /A.aVal|{}aVal[0]
+      public final val aVal: kotlin/Int /* = 0 */
+        // signature: /A.aVal.<get-aVal>|<get-aVal>(){}[0]
+        public final get
+
+      // signature: /A.aVar|{}aVar[0]
+      public final var aVar: kotlin/String
+        // signature: /A.aVar.<get-aVar>|<get-aVar>(){}[0]
+        public final get
+        // signature: /A.aVar.<set-aVar>|<set-aVar>(kotlin.String){}[0]
+        public final set
+
+      // nested class: B
+
+      // nested class: E
     }
-    // Signature: /F|null[0]
-    data class F constructor(fVal: Int, fVar: String) {
-        // Signature: /F.fVal|{}fVal[0]
-        val fVal: Int
-        // Signature: /F.fVar|{}fVar[0]
-        var fVar: String
-        // Signature: /F.component1|component1(){}[0]
-        operator fun component1(): Int
-        // Signature: /F.component2|component2(){}[0]
-        operator fun component2(): String
-        // Signature: /F.copy|copy(kotlin.Int;kotlin.String){}[0]
-        fun copy(fVal: Int = ..., fVar: String = ...): F
-        // Signature: /F.equals|equals(kotlin.Any?){}[0]
-        override fun equals(other: Any?): Boolean
-        // Signature: /F.fFun|fFun(){}[0]
-        fun fFun()
-        // Signature: /F.hashCode|hashCode(){}[0]
-        override fun hashCode(): Int
-        // Signature: /F.toString|toString(){}[0]
-        override fun toString(): String
+
+    // signature: /A.B|null[0]
+    public final inner class A.B : kotlin/Any {
+
+      // signature: /A.B.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /A.B.bFun|bFun(){}[0]
+      public final fun bFun(): kotlin/Unit
+
+      // signature: /A.B.bVal|{}bVal[0]
+      public final val bVal: kotlin/Int /* = 0 */
+        // signature: /A.B.bVal.<get-bVal>|<get-bVal>(){}[0]
+        public final get
+
+      // signature: /A.B.bVar|{}bVar[0]
+      public final var bVar: kotlin/String
+        // signature: /A.B.bVar.<get-bVar>|<get-bVar>(){}[0]
+        public final get
+        // signature: /A.B.bVar.<set-bVar>|<set-bVar>(kotlin.String){}[0]
+        public final set
+
+      // nested class: C
+
+      // nested class: D
     }
-    // Signature: /FinalImpl|null[0]
-    class FinalImpl constructor() : OpenImpl {
-        // Signature: /FinalImpl.iVal|{}iVal[0]
-        override val iVal: Int = 0
-        // Signature: /FinalImpl.iVar|{}iVar[0]
-        override var iVar: String
-        // Signature: /FinalImpl.iFun|iFun(){}[0]
-        override fun iFun()
+
+    // signature: /A.B.C|null[0]
+    public final inner class A.B.C : kotlin/Any {
+
+      // signature: /A.B.C.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /A.B.C.cFun|cFun(){}[0]
+      public final fun cFun(): kotlin/Unit
+
+      // signature: /A.B.C.cVal|{}cVal[0]
+      public final val cVal: kotlin/Int /* = 0 */
+        // signature: /A.B.C.cVal.<get-cVal>|<get-cVal>(){}[0]
+        public final get
+
+      // signature: /A.B.C.cVar|{}cVar[0]
+      public final var cVar: kotlin/String
+        // signature: /A.B.C.cVar.<get-cVar>|<get-cVar>(){}[0]
+        public final get
+        // signature: /A.B.C.cVar.<set-cVar>|<set-cVar>(kotlin.String){}[0]
+        public final set
     }
-    // Signature: /Interface|null[0]
-    interface Interface {
-        // Signature: /Interface.iVal|{}iVal[0]
-        val iVal: Int
-        // Signature: /Interface.iVar|{}iVar[0]
-        var iVar: String
-        // Signature: /Interface.iFun|iFun(){}[0]
-        fun iFun()
+
+    // signature: /A.B.D|null[0]
+    private final inner class A.B.D : kotlin/Any {
+
+      // signature: /A.B.D.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /A.B.D.dFun|dFun(){}[0]
+      public final fun dFun(): kotlin/Unit
+
+      // signature: /A.B.D.dVal|{}dVal[0]
+      public final val dVal: kotlin/Int /* = 0 */
+        // signature: /A.B.D.dVal.<get-dVal>|<get-dVal>(){}[0]
+        public final get
+
+      // signature: /A.B.D.dVar|{}dVar[0]
+      public final var dVar: kotlin/String
+        // signature: /A.B.D.dVar.<get-dVar>|<get-dVar>(){}[0]
+        public final get
+        // signature: /A.B.D.dVar.<set-dVar>|<set-dVar>(kotlin.String){}[0]
+        public final set
     }
-    // Signature: /OpenImpl|null[0]
-    open class OpenImpl constructor() : Interface {
-        // Signature: /OpenImpl.iVal|{}iVal[0]
-        override val iVal: Int = 0
-        // Signature: /OpenImpl.iVar|{}iVar[0]
-        override var iVar: String
-        // Signature: /OpenImpl.iFun|iFun(){}[0]
-        override fun iFun()
+
+    // signature: /A.E|null[0]
+    public final class A.E : kotlin/Any {
+
+      // signature: /A.E.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /A.E.eFun|eFun(){}[0]
+      public final fun eFun(): kotlin/Unit
+
+      // signature: /A.E.eVal|{}eVal[0]
+      public final val eVal: kotlin/Int /* = 0 */
+        // signature: /A.E.eVal.<get-eVal>|<get-eVal>(){}[0]
+        public final get
+
+      // signature: /A.E.eVar|{}eVar[0]
+      public final var eVar: kotlin/String
+        // signature: /A.E.eVar.<get-eVar>|<get-eVar>(){}[0]
+        public final get
+        // signature: /A.E.eVar.<set-eVar>|<set-eVar>(kotlin.String){}[0]
+        public final set
     }
+
+    // signature: /F|null[0]
+    public final data class F : kotlin/Any {
+
+      // signature: /F.<init>|<init>(kotlin.Int;kotlin.String){}[0]
+      public constructor(fVal: kotlin/Int, fVar: kotlin/String)
+
+      // signature: /F.component1|component1(){}[0]
+      public final /* synthesized */ operator fun component1(): kotlin/Int
+
+      // signature: /F.component2|component2(){}[0]
+      public final /* synthesized */ operator fun component2(): kotlin/String
+
+      // signature: /F.copy|copy(kotlin.Int;kotlin.String){}[0]
+      public final /* synthesized */ fun copy(fVal: kotlin/Int /* = ... */, fVar: kotlin/String /* = ... */): F
+
+      // signature: /F.equals|equals(kotlin.Any?){}[0]
+      public open /* synthesized */ operator fun equals(other: kotlin/Any?): kotlin/Boolean
+
+      // signature: /F.fFun|fFun(){}[0]
+      public final fun fFun(): kotlin/Unit
+
+      // signature: /F.hashCode|hashCode(){}[0]
+      public open /* synthesized */ fun hashCode(): kotlin/Int
+
+      // signature: /F.toString|toString(){}[0]
+      public open /* synthesized */ fun toString(): kotlin/String
+
+      // signature: /F.fVal|{}fVal[0]
+      public final val fVal: kotlin/Int
+        // signature: /F.fVal.<get-fVal>|<get-fVal>(){}[0]
+        public final get
+
+      // signature: /F.fVar|{}fVar[0]
+      public final var fVar: kotlin/String
+        // signature: /F.fVar.<get-fVar>|<get-fVar>(){}[0]
+        public final get
+        // signature: /F.fVar.<set-fVar>|<set-fVar>(kotlin.String){}[0]
+        public final set
+    }
+
+    // signature: /FinalImpl|null[0]
+    public final class FinalImpl : OpenImpl {
+
+      // signature: /FinalImpl.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /FinalImpl.iFun|iFun(){}[0]
+      public open fun iFun(): kotlin/Unit
+
+      // signature: /FinalImpl.iVal|{}iVal[0]
+      public open val iVal: kotlin/Int /* = 0 */
+        // signature: /FinalImpl.iVal.<get-iVal>|<get-iVal>(){}[0]
+        public open get
+
+      // signature: /FinalImpl.iVar|{}iVar[0]
+      public open var iVar: kotlin/String
+        // signature: /FinalImpl.iVar.<get-iVar>|<get-iVar>(){}[0]
+        public open get
+        // signature: /FinalImpl.iVar.<set-iVar>|<set-iVar>(kotlin.String){}[0]
+        public open set
+    }
+
+    // signature: /Interface|null[0]
+    public abstract interface Interface : kotlin/Any {
+
+      // signature: /Interface.iFun|iFun(){}[0]
+      public abstract fun iFun(): kotlin/Unit
+
+      // signature: /Interface.iVal|{}iVal[0]
+      public abstract val iVal: kotlin/Int
+        // signature: /Interface.iVal.<get-iVal>|<get-iVal>(){}[0]
+        public abstract get
+
+      // signature: /Interface.iVar|{}iVar[0]
+      public abstract var iVar: kotlin/String
+        // signature: /Interface.iVar.<get-iVar>|<get-iVar>(){}[0]
+        public abstract get
+        // signature: /Interface.iVar.<set-iVar>|<set-iVar>(kotlin.String){}[0]
+        public abstract set
+    }
+
+    // signature: /OpenImpl|null[0]
+    public open class OpenImpl : Interface {
+
+      // signature: /OpenImpl.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /OpenImpl.iFun|iFun(){}[0]
+      public open fun iFun(): kotlin/Unit
+
+      // signature: /OpenImpl.iVal|{}iVal[0]
+      public open val iVal: kotlin/Int /* = 0 */
+        // signature: /OpenImpl.iVal.<get-iVal>|<get-iVal>(){}[0]
+        public open get
+
+      // signature: /OpenImpl.iVar|{}iVar[0]
+      public open var iVar: kotlin/String
+        // signature: /OpenImpl.iVar.<get-iVar>|<get-iVar>(){}[0]
+        public open get
+        // signature: /OpenImpl.iVar.<set-iVar>|<set-iVar>(kotlin.String){}[0]
+        public open set
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Constructors.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 @file:Suppress("UNUSED_PARAMETER")
 
 annotation class A

native/native.tests/testData/klib/dump-metadata/Constructors.txt

@@ -1,20 +1,71 @@
-package <root> {
-    annotation class A constructor() : Annotation
-    class Bar @A constructor(x: Int)
-    class Baz private constructor(x: Int)
-    class Foo constructor(x: Int) {
-        constructor()
-        constructor(x: Double)
-        constructor(x: Double, y: Int)
-        protected constructor(x: String)
-        @A constructor(x: Foo)
+library {
+  // module name: <Constructors.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: Bar
+    // class name: Baz
+    // class name: Foo
+    // class name: Qux
+    // class name: Typed
+
+    public final annotation class A : kotlin/Annotation {
+
+      public constructor()
     }
-    class Qux protected constructor(x: Int)
-    class Typed<T> constructor(x: Int) {
-        constructor()
-        constructor(x: Double)
-        constructor(x: Double, y: Int)
-        protected constructor(x: String)
-        @A constructor(x: Foo)
+
+    public final class Bar : kotlin/Any {
+
+      @A
+      public constructor(x: kotlin/Int)
     }
-}
+
+    public final class Baz : kotlin/Any {
+
+      private constructor(x: kotlin/Int)
+    }
+
+    public final class Foo : kotlin/Any {
+
+      public /* secondary */ constructor()
+
+      @A
+      public /* secondary */ constructor(x: Foo)
+
+      public /* secondary */ constructor(x: kotlin/Double)
+
+      public constructor(x: kotlin/Int)
+
+      private /* secondary */ constructor(x: kotlin/Long)
+
+      protected /* secondary */ constructor(x: kotlin/String)
+
+      public /* secondary */ constructor(x: kotlin/Double, y: kotlin/Int)
+    }
+
+    public final class Qux : kotlin/Any {
+
+      protected constructor(x: kotlin/Int)
+    }
+
+    public final class Typed<T#0 /* T */> : kotlin/Any {
+
+      public /* secondary */ constructor()
+
+      @A
+      public /* secondary */ constructor(x: Foo)
+
+      public /* secondary */ constructor(x: kotlin/Double)
+
+      public constructor(x: kotlin/Int)
+
+      private /* secondary */ constructor(x: kotlin/Long)
+
+      protected /* secondary */ constructor(x: kotlin/String)
+
+      public /* secondary */ constructor(x: kotlin/Double, y: kotlin/Int)
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Constructors.v1.txt

@@ -1,36 +1,95 @@
-package <root> {
-    // Signature: /A|null[0]
-    annotation class A constructor() : Annotation
-    // Signature: /Bar|null[0]
-    class Bar @A constructor(x: Int)
-    // Signature: /Baz|null[0]
-    class Baz private constructor(x: Int)
-    // Signature: /Foo|null[0]
-    class Foo constructor(x: Int) {
-        // Signature: /Foo.<init>|-5645683436151566731[0]
-        constructor()
-        // Signature: /Foo.<init>|575075696928934302[0]
-        constructor(x: Double)
-        // Signature: /Foo.<init>|-648032236499795795[0]
-        constructor(x: Double, y: Int)
-        // Signature: /Foo.<init>|1280618353163213788[0]
-        protected constructor(x: String)
-        // Signature: /Foo.<init>|5452796351634795197[0]
-        @A constructor(x: Foo)
+library {
+  // module name: <Constructors.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: Bar
+    // class name: Baz
+    // class name: Foo
+    // class name: Qux
+    // class name: Typed
+
+    // signature: /A|null[0]
+    public final annotation class A : kotlin/Annotation {
+
+      // signature: /A.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: /Qux|null[0]
-    class Qux protected constructor(x: Int)
-    // Signature: /Typed|null[0]
-    class Typed<T> constructor(x: Int) {
-        // Signature: /Typed.<init>|-5645683436151566731[0]
-        constructor()
-        // Signature: /Typed.<init>|575075696928934302[0]
-        constructor(x: Double)
-        // Signature: /Typed.<init>|-648032236499795795[0]
-        constructor(x: Double, y: Int)
-        // Signature: /Typed.<init>|1280618353163213788[0]
-        protected constructor(x: String)
-        // Signature: /Typed.<init>|5452796351634795197[0]
-        @A constructor(x: Foo)
+
+    // signature: /Bar|null[0]
+    public final class Bar : kotlin/Any {
+
+      // signature: /Bar.<init>|-5182794243525578284[0]
+      @A
+      public constructor(x: kotlin/Int)
     }
+
+    // signature: /Baz|null[0]
+    public final class Baz : kotlin/Any {
+
+      // signature: /Baz.<init>|-5182794243525578284[0]
+      private constructor(x: kotlin/Int)
+    }
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|-5645683436151566731[0]
+      public /* secondary */ constructor()
+
+      // signature: /Foo.<init>|5452796351634795197[0]
+      @A
+      public /* secondary */ constructor(x: Foo)
+
+      // signature: /Foo.<init>|575075696928934302[0]
+      public /* secondary */ constructor(x: kotlin/Double)
+
+      // signature: /Foo.<init>|-5182794243525578284[0]
+      public constructor(x: kotlin/Int)
+
+      // signature: /Foo.<init>|5217973964116651322[0]
+      private /* secondary */ constructor(x: kotlin/Long)
+
+      // signature: /Foo.<init>|1280618353163213788[0]
+      protected /* secondary */ constructor(x: kotlin/String)
+
+      // signature: /Foo.<init>|-648032236499795795[0]
+      public /* secondary */ constructor(x: kotlin/Double, y: kotlin/Int)
+    }
+
+    // signature: /Qux|null[0]
+    public final class Qux : kotlin/Any {
+
+      // signature: /Qux.<init>|-5182794243525578284[0]
+      protected constructor(x: kotlin/Int)
+    }
+
+    // signature: /Typed|null[0]
+    public final class Typed<T#0 /* T */> : kotlin/Any {
+
+      // signature: /Typed.<init>|-5645683436151566731[0]
+      public /* secondary */ constructor()
+
+      // signature: /Typed.<init>|5452796351634795197[0]
+      @A
+      public /* secondary */ constructor(x: Foo)
+
+      // signature: /Typed.<init>|575075696928934302[0]
+      public /* secondary */ constructor(x: kotlin/Double)
+
+      // signature: /Typed.<init>|-5182794243525578284[0]
+      public constructor(x: kotlin/Int)
+
+      // signature: /Typed.<init>|5217973964116651322[0]
+      private /* secondary */ constructor(x: kotlin/Long)
+
+      // signature: /Typed.<init>|1280618353163213788[0]
+      protected /* secondary */ constructor(x: kotlin/String)
+
+      // signature: /Typed.<init>|-648032236499795795[0]
+      public /* secondary */ constructor(x: kotlin/Double, y: kotlin/Int)
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Constructors.v2.txt

@@ -1,36 +1,95 @@
-package <root> {
-    // Signature: /A|null[0]
-    annotation class A constructor() : Annotation
-    // Signature: /Bar|null[0]
-    class Bar @A constructor(x: Int)
-    // Signature: /Baz|null[0]
-    class Baz private constructor(x: Int)
-    // Signature: /Foo|null[0]
-    class Foo constructor(x: Int) {
-        // Signature: /Foo.<init>|<init>(){}[0]
-        constructor()
-        // Signature: /Foo.<init>|<init>(kotlin.Double){}[0]
-        constructor(x: Double)
-        // Signature: /Foo.<init>|<init>(kotlin.Double;kotlin.Int){}[0]
-        constructor(x: Double, y: Int)
-        // Signature: /Foo.<init>|<init>(kotlin.String){}[0]
-        protected constructor(x: String)
-        // Signature: /Foo.<init>|<init>(Foo){}[0]
-        @A constructor(x: Foo)
+library {
+  // module name: <Constructors.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: Bar
+    // class name: Baz
+    // class name: Foo
+    // class name: Qux
+    // class name: Typed
+
+    // signature: /A|null[0]
+    public final annotation class A : kotlin/Annotation {
+
+      // signature: /A.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: /Qux|null[0]
-    class Qux protected constructor(x: Int)
-    // Signature: /Typed|null[0]
-    class Typed<T> constructor(x: Int) {
-        // Signature: /Typed.<init>|<init>(){}[0]
-        constructor()
-        // Signature: /Typed.<init>|<init>(kotlin.Double){}[0]
-        constructor(x: Double)
-        // Signature: /Typed.<init>|<init>(kotlin.Double;kotlin.Int){}[0]
-        constructor(x: Double, y: Int)
-        // Signature: /Typed.<init>|<init>(kotlin.String){}[0]
-        protected constructor(x: String)
-        // Signature: /Typed.<init>|<init>(Foo){}[0]
-        @A constructor(x: Foo)
+
+    // signature: /Bar|null[0]
+    public final class Bar : kotlin/Any {
+
+      // signature: /Bar.<init>|<init>(kotlin.Int){}[0]
+      @A
+      public constructor(x: kotlin/Int)
     }
+
+    // signature: /Baz|null[0]
+    public final class Baz : kotlin/Any {
+
+      // signature: /Baz.<init>|<init>(kotlin.Int){}[0]
+      private constructor(x: kotlin/Int)
+    }
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|<init>(){}[0]
+      public /* secondary */ constructor()
+
+      // signature: /Foo.<init>|<init>(Foo){}[0]
+      @A
+      public /* secondary */ constructor(x: Foo)
+
+      // signature: /Foo.<init>|<init>(kotlin.Double){}[0]
+      public /* secondary */ constructor(x: kotlin/Double)
+
+      // signature: /Foo.<init>|<init>(kotlin.Int){}[0]
+      public constructor(x: kotlin/Int)
+
+      // signature: /Foo.<init>|<init>(kotlin.Long){}[0]
+      private /* secondary */ constructor(x: kotlin/Long)
+
+      // signature: /Foo.<init>|<init>(kotlin.String){}[0]
+      protected /* secondary */ constructor(x: kotlin/String)
+
+      // signature: /Foo.<init>|<init>(kotlin.Double;kotlin.Int){}[0]
+      public /* secondary */ constructor(x: kotlin/Double, y: kotlin/Int)
+    }
+
+    // signature: /Qux|null[0]
+    public final class Qux : kotlin/Any {
+
+      // signature: /Qux.<init>|<init>(kotlin.Int){}[0]
+      protected constructor(x: kotlin/Int)
+    }
+
+    // signature: /Typed|null[0]
+    public final class Typed<T#0 /* T */> : kotlin/Any {
+
+      // signature: /Typed.<init>|<init>(){}[0]
+      public /* secondary */ constructor()
+
+      // signature: /Typed.<init>|<init>(Foo){}[0]
+      @A
+      public /* secondary */ constructor(x: Foo)
+
+      // signature: /Typed.<init>|<init>(kotlin.Double){}[0]
+      public /* secondary */ constructor(x: kotlin/Double)
+
+      // signature: /Typed.<init>|<init>(kotlin.Int){}[0]
+      public constructor(x: kotlin/Int)
+
+      // signature: /Typed.<init>|<init>(kotlin.Long){}[0]
+      private /* secondary */ constructor(x: kotlin/Long)
+
+      // signature: /Typed.<init>|<init>(kotlin.String){}[0]
+      protected /* secondary */ constructor(x: kotlin/String)
+
+      // signature: /Typed.<init>|<init>(kotlin.Double;kotlin.Int){}[0]
+      public /* secondary */ constructor(x: kotlin/Double, y: kotlin/Int)
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Enum.fir.txt

@@ -0,0 +1,34 @@
+library {
+  // module name: <Enum.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: E
+
+    public final enum class E : kotlin/Enum<E> {
+
+      private constructor(x: kotlin/Int /* = ... */)
+
+      public open fun enumFun(): kotlin/Int
+
+      public final val enumVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var enumVar: kotlin/String
+        public final get
+        public final set
+
+      public final val x: kotlin/Int
+        public final get
+
+      A,
+
+      B,
+
+      C,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Enum.txt

@@ -1,11 +1,48 @@
-package <root> {
-    enum class E private constructor(x: Int = ...) : Enum<E> {
-        enum entry A
-        enum entry B
-        enum entry C
-        val enumVal: Int = 0
-        var enumVar: String
-        val x: Int
-        open fun enumFun(): Int
+library {
+  // module name: <Enum.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: E
+    // class name: E.A
+    // class name: E.B
+    // class name: E.C
+
+    public final enum class E : kotlin/Enum<E> {
+
+      private constructor(x: kotlin/Int /* = ... */)
+
+      public open fun enumFun(): kotlin/Int
+
+      public final val enumVal: kotlin/Int /* = 0 */
+        public final get
+
+      public final var enumVar: kotlin/String
+        public final get
+        public final set
+
+      public final val x: kotlin/Int
+        public final get
+
+      A,
+
+      B,
+
+      C,
+
+      // has Enum.entries
     }
-}
+
+    public final enum entry E.A : E {
+    }
+
+    public final enum entry E.B : E {
+    }
+
+    public final enum entry E.C : E {
+
+      public open fun enumFun(): kotlin/Int
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Enum.v1.fir.txt

@@ -0,0 +1,47 @@
+library {
+  // module name: <Enum.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: E
+
+    // signature: /E|null[0]
+    public final enum class E : kotlin/Enum<E> {
+
+      // signature: /E.<init>|-5182794243525578284[0]
+      private constructor(x: kotlin/Int /* = ... */)
+
+      // signature: /E.enumFun|7331595556228318192[0]
+      public open fun enumFun(): kotlin/Int
+
+      // signature: /E.enumVal|-794670998786832931[0]
+      public final val enumVal: kotlin/Int /* = 0 */
+        // signature: /E.enumVal.<get-enumVal>|2351802094437052431[0]
+        public final get
+
+      // signature: /E.enumVar|-3275598925785518996[0]
+      public final var enumVar: kotlin/String
+        // signature: /E.enumVar.<get-enumVar>|1169914060484710215[0]
+        public final get
+        // signature: /E.enumVar.<set-enumVar>|-2620334385099104445[0]
+        public final set
+
+      // signature: /E.x|-8060530855978347579[0]
+      public final val x: kotlin/Int
+        // signature: /E.x.<get-x>|1482705010654679335[0]
+        public final get
+
+      // signature: /E.A|null[0]
+      A,
+
+      // signature: /E.B|null[0]
+      B,
+
+      // signature: /E.C|null[0]
+      C,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Enum.v1.txt

@@ -1,19 +1,65 @@
-package <root> {
-    // Signature: /E|null[0]
-    enum class E private constructor(x: Int = ...) : Enum<E> {
-        // Signature: /E.A|null[0]
-        enum entry A
-        // Signature: /E.B|null[0]
-        enum entry B
-        // Signature: /E.C|null[0]
-        enum entry C
-        // Signature: /E.enumVal|-794670998786832931[0]
-        val enumVal: Int = 0
-        // Signature: /E.enumVar|-3275598925785518996[0]
-        var enumVar: String
-        // Signature: /E.x|-8060530855978347579[0]
-        val x: Int
-        // Signature: /E.enumFun|7331595556228318192[0]
-        open fun enumFun(): Int
+library {
+  // module name: <Enum.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: E
+    // class name: E.A
+    // class name: E.B
+    // class name: E.C
+
+    // signature: /E|null[0]
+    public final enum class E : kotlin/Enum<E> {
+
+      // signature: /E.<init>|-5182794243525578284[0]
+      private constructor(x: kotlin/Int /* = ... */)
+
+      // signature: /E.enumFun|7331595556228318192[0]
+      public open fun enumFun(): kotlin/Int
+
+      // signature: /E.enumVal|-794670998786832931[0]
+      public final val enumVal: kotlin/Int /* = 0 */
+        // signature: /E.enumVal.<get-enumVal>|2351802094437052431[0]
+        public final get
+
+      // signature: /E.enumVar|-3275598925785518996[0]
+      public final var enumVar: kotlin/String
+        // signature: /E.enumVar.<get-enumVar>|1169914060484710215[0]
+        public final get
+        // signature: /E.enumVar.<set-enumVar>|-2620334385099104445[0]
+        public final set
+
+      // signature: /E.x|-8060530855978347579[0]
+      public final val x: kotlin/Int
+        // signature: /E.x.<get-x>|1482705010654679335[0]
+        public final get
+
+      // signature: /E.A|null[0]
+      A,
+
+      // signature: /E.B|null[0]
+      B,
+
+      // signature: /E.C|null[0]
+      C,
+
+      // has Enum.entries
     }
+
+    // signature: /E.A|null[0]
+    public final enum entry E.A : E {
+    }
+
+    // signature: /E.B|null[0]
+    public final enum entry E.B : E {
+    }
+
+    // signature: /E.C|null[0]
+    public final enum entry E.C : E {
+
+      // signature: /E.C.<EEC>.enumFun|7331595556228318192[0]
+      public open fun enumFun(): kotlin/Int
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Enum.v2.fir.txt

@@ -0,0 +1,47 @@
+library {
+  // module name: <Enum.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: E
+
+    // signature: /E|null[0]
+    public final enum class E : kotlin/Enum<E> {
+
+      // signature: /E.<init>|<init>(kotlin.Int){}[0]
+      private constructor(x: kotlin/Int /* = ... */)
+
+      // signature: /E.enumFun|enumFun(){}[0]
+      public open fun enumFun(): kotlin/Int
+
+      // signature: /E.enumVal|{}enumVal[0]
+      public final val enumVal: kotlin/Int /* = 0 */
+        // signature: /E.enumVal.<get-enumVal>|<get-enumVal>(){}[0]
+        public final get
+
+      // signature: /E.enumVar|{}enumVar[0]
+      public final var enumVar: kotlin/String
+        // signature: /E.enumVar.<get-enumVar>|<get-enumVar>(){}[0]
+        public final get
+        // signature: /E.enumVar.<set-enumVar>|<set-enumVar>(kotlin.String){}[0]
+        public final set
+
+      // signature: /E.x|{}x[0]
+      public final val x: kotlin/Int
+        // signature: /E.x.<get-x>|<get-x>(){}[0]
+        public final get
+
+      // signature: /E.A|null[0]
+      A,
+
+      // signature: /E.B|null[0]
+      B,
+
+      // signature: /E.C|null[0]
+      C,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Enum.v2.txt

@@ -1,19 +1,65 @@
-package <root> {
-    // Signature: /E|null[0]
-    enum class E private constructor(x: Int = ...) : Enum<E> {
-        // Signature: /E.A|null[0]
-        enum entry A
-        // Signature: /E.B|null[0]
-        enum entry B
-        // Signature: /E.C|null[0]
-        enum entry C
-        // Signature: /E.enumVal|{}enumVal[0]
-        val enumVal: Int = 0
-        // Signature: /E.enumVar|{}enumVar[0]
-        var enumVar: String
-        // Signature: /E.x|{}x[0]
-        val x: Int
-        // Signature: /E.enumFun|enumFun(){}[0]
-        open fun enumFun(): Int
+library {
+  // module name: <Enum.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: E
+    // class name: E.A
+    // class name: E.B
+    // class name: E.C
+
+    // signature: /E|null[0]
+    public final enum class E : kotlin/Enum<E> {
+
+      // signature: /E.<init>|<init>(kotlin.Int){}[0]
+      private constructor(x: kotlin/Int /* = ... */)
+
+      // signature: /E.enumFun|enumFun(){}[0]
+      public open fun enumFun(): kotlin/Int
+
+      // signature: /E.enumVal|{}enumVal[0]
+      public final val enumVal: kotlin/Int /* = 0 */
+        // signature: /E.enumVal.<get-enumVal>|<get-enumVal>(){}[0]
+        public final get
+
+      // signature: /E.enumVar|{}enumVar[0]
+      public final var enumVar: kotlin/String
+        // signature: /E.enumVar.<get-enumVar>|<get-enumVar>(){}[0]
+        public final get
+        // signature: /E.enumVar.<set-enumVar>|<set-enumVar>(kotlin.String){}[0]
+        public final set
+
+      // signature: /E.x|{}x[0]
+      public final val x: kotlin/Int
+        // signature: /E.x.<get-x>|<get-x>(){}[0]
+        public final get
+
+      // signature: /E.A|null[0]
+      A,
+
+      // signature: /E.B|null[0]
+      B,
+
+      // signature: /E.C|null[0]
+      C,
+
+      // has Enum.entries
     }
+
+    // signature: /E.A|null[0]
+    public final enum entry E.A : E {
+    }
+
+    // signature: /E.B|null[0]
+    public final enum entry E.B : E {
+    }
+
+    // signature: /E.C|null[0]
+    public final enum entry E.C : E {
+
+      // signature: /E.C.<EEC>.enumFun|enumFun(){}[0]
+      public open fun enumFun(): kotlin/Int
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/FunctionModifiers.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 class Foo {
     fun f1() {}
     infix fun f2(x: Int) {}

native/native.tests/testData/klib/dump-metadata/FunctionModifiers.txt

@@ -1,10 +1,26 @@
-package <root> {
-    class Foo constructor() {
-        fun f1()
-        infix fun f2(x: Int)
-        suspend fun f3()
-        tailrec fun f4()
-        fun f5(vararg x: Int)
-        operator fun plus(x: Int)
+library {
+  // module name: <FunctionModifiers.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: Foo
+
+    public final class Foo : kotlin/Any {
+
+      public constructor()
+
+      public final fun f1(): kotlin/Unit
+
+      public final infix fun f2(x: kotlin/Int): kotlin/Unit
+
+      public final suspend fun f3(): kotlin/Unit
+
+      public final tailrec fun f4(): kotlin/Unit
+
+      public final fun f5(vararg x: kotlin/Int /* kotlin/IntArray */): kotlin/Unit
+
+      public final operator fun plus(x: kotlin/Int): kotlin/Unit
     }
-}
+  }
+}

native/native.tests/testData/klib/dump-metadata/FunctionModifiers.v1.txt

@@ -1,17 +1,34 @@
-package <root> {
-    // Signature: /Foo|null[0]
-    class Foo constructor() {
-        // Signature: /Foo.f1|3067719429478803475[0]
-        fun f1()
-        // Signature: /Foo.f2|998031826907343926[0]
-        infix fun f2(x: Int)
-        // Signature: /Foo.f3|-7352656899019660364[0]
-        suspend fun f3()
-        // Signature: /Foo.f4|-653369539400762817[0]
-        tailrec fun f4()
-        // Signature: /Foo.f5|136030160982396464[0]
-        fun f5(vararg x: Int)
-        // Signature: /Foo.plus|4955128566171430399[0]
-        operator fun plus(x: Int)
+library {
+  // module name: <FunctionModifiers.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: Foo
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /Foo.f1|3067719429478803475[0]
+      public final fun f1(): kotlin/Unit
+
+      // signature: /Foo.f2|998031826907343926[0]
+      public final infix fun f2(x: kotlin/Int): kotlin/Unit
+
+      // signature: /Foo.f3|-7352656899019660364[0]
+      public final suspend fun f3(): kotlin/Unit
+
+      // signature: /Foo.f4|-653369539400762817[0]
+      public final tailrec fun f4(): kotlin/Unit
+
+      // signature: /Foo.f5|136030160982396464[0]
+      public final fun f5(vararg x: kotlin/Int /* kotlin/IntArray */): kotlin/Unit
+
+      // signature: /Foo.plus|4955128566171430399[0]
+      public final operator fun plus(x: kotlin/Int): kotlin/Unit
     }
+  }
 }

native/native.tests/testData/klib/dump-metadata/FunctionModifiers.v2.txt

@@ -1,17 +1,34 @@
-package <root> {
-    // Signature: /Foo|null[0]
-    class Foo constructor() {
-        // Signature: /Foo.f1|f1(){}[0]
-        fun f1()
-        // Signature: /Foo.f2|f2(kotlin.Int){}[0]
-        infix fun f2(x: Int)
-        // Signature: /Foo.f3|f3(){}[0]
-        suspend fun f3()
-        // Signature: /Foo.f4|f4(){}[0]
-        tailrec fun f4()
-        // Signature: /Foo.f5|f5(kotlin.IntArray...){}[0]
-        fun f5(vararg x: Int)
-        // Signature: /Foo.plus|plus(kotlin.Int){}[0]
-        operator fun plus(x: Int)
+library {
+  // module name: <FunctionModifiers.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: Foo
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /Foo.f1|f1(){}[0]
+      public final fun f1(): kotlin/Unit
+
+      // signature: /Foo.f2|f2(kotlin.Int){}[0]
+      public final infix fun f2(x: kotlin/Int): kotlin/Unit
+
+      // signature: /Foo.f3|f3(){}[0]
+      public final suspend fun f3(): kotlin/Unit
+
+      // signature: /Foo.f4|f4(){}[0]
+      public final tailrec fun f4(): kotlin/Unit
+
+      // signature: /Foo.f5|f5(kotlin.IntArray...){}[0]
+      public final fun f5(vararg x: kotlin/Int /* kotlin/IntArray */): kotlin/Unit
+
+      // signature: /Foo.plus|plus(kotlin.Int){}[0]
+      public final operator fun plus(x: kotlin/Int): kotlin/Unit
     }
+  }
 }

native/native.tests/testData/klib/dump-metadata/MethodModality.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 interface Interface {
     fun interfaceFun()
 }

native/native.tests/testData/klib/dump-metadata/MethodModality.txt

@@ -1,19 +1,48 @@
-package <root> {
-    abstract class AbstractClass constructor() : Interface {
-        abstract fun abstractFun()
-        override fun interfaceFun()
+library {
+  // module name: <MethodModality.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: AbstractClass
+    // class name: FinalClass
+    // class name: Interface
+    // class name: OpenClass
+
+    public abstract class AbstractClass : Interface {
+
+      public constructor()
+
+      public abstract fun abstractFun(): kotlin/Unit
+
+      public open fun interfaceFun(): kotlin/Unit
     }
-    class FinalClass constructor() : OpenClass {
-        override fun openFun1()
-        final override fun openFun2()
+
+    public final class FinalClass : OpenClass {
+
+      public constructor()
+
+      public open fun openFun1(): kotlin/Unit
+
+      public final fun openFun2(): kotlin/Unit
     }
-    interface Interface {
-        fun interfaceFun()
+
+    public abstract interface Interface : kotlin/Any {
+
+      public abstract fun interfaceFun(): kotlin/Unit
     }
-    open class OpenClass constructor() : AbstractClass {
-        override fun abstractFun()
-        fun finalFun()
-        open fun openFun1()
-        open fun openFun2()
+
+    public open class OpenClass : AbstractClass {
+
+      public constructor()
+
+      public open fun abstractFun(): kotlin/Unit
+
+      public final fun finalFun(): kotlin/Unit
+
+      public open fun openFun1(): kotlin/Unit
+
+      public open fun openFun2(): kotlin/Unit
     }
-}
+  }
+}

native/native.tests/testData/klib/dump-metadata/MethodModality.v1.txt

@@ -1,32 +1,64 @@
-package <root> {
-    // Signature: /AbstractClass|null[0]
-    abstract class AbstractClass constructor() : Interface {
-        // Signature: /AbstractClass.abstractFun|-8137574360252002020[0]
-        abstract fun abstractFun()
-        // Signature: /AbstractClass.interfaceFun|2213060701516703022[0]
-        override fun interfaceFun()
+library {
+  // module name: <MethodModality.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: AbstractClass
+    // class name: FinalClass
+    // class name: Interface
+    // class name: OpenClass
+
+    // signature: /AbstractClass|null[0]
+    public abstract class AbstractClass : Interface {
+
+      // signature: /AbstractClass.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /AbstractClass.abstractFun|-8137574360252002020[0]
+      public abstract fun abstractFun(): kotlin/Unit
+
+      // signature: /AbstractClass.interfaceFun|2213060701516703022[0]
+      public open fun interfaceFun(): kotlin/Unit
     }
-    // Signature: /FinalClass|null[0]
-    class FinalClass constructor() : OpenClass {
-        // Signature: /FinalClass.openFun1|-6191809905018816441[0]
-        override fun openFun1()
-        // Signature: /FinalClass.openFun2|-6569900631812216745[0]
-        final override fun openFun2()
+
+    // signature: /FinalClass|null[0]
+    public final class FinalClass : OpenClass {
+
+      // signature: /FinalClass.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /FinalClass.openFun1|-6191809905018816441[0]
+      public open fun openFun1(): kotlin/Unit
+
+      // signature: /FinalClass.openFun2|-6569900631812216745[0]
+      public final fun openFun2(): kotlin/Unit
     }
-    // Signature: /Interface|null[0]
-    interface Interface {
-        // Signature: /Interface.interfaceFun|2213060701516703022[0]
-        fun interfaceFun()
+
+    // signature: /Interface|null[0]
+    public abstract interface Interface : kotlin/Any {
+
+      // signature: /Interface.interfaceFun|2213060701516703022[0]
+      public abstract fun interfaceFun(): kotlin/Unit
     }
-    // Signature: /OpenClass|null[0]
-    open class OpenClass constructor() : AbstractClass {
-        // Signature: /OpenClass.abstractFun|-8137574360252002020[0]
-        override fun abstractFun()
-        // Signature: /OpenClass.finalFun|3657632771909858561[0]
-        fun finalFun()
-        // Signature: /OpenClass.openFun1|-6191809905018816441[0]
-        open fun openFun1()
-        // Signature: /OpenClass.openFun2|-6569900631812216745[0]
-        open fun openFun2()
+
+    // signature: /OpenClass|null[0]
+    public open class OpenClass : AbstractClass {
+
+      // signature: /OpenClass.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // signature: /OpenClass.abstractFun|-8137574360252002020[0]
+      public open fun abstractFun(): kotlin/Unit
+
+      // signature: /OpenClass.finalFun|3657632771909858561[0]
+      public final fun finalFun(): kotlin/Unit
+
+      // signature: /OpenClass.openFun1|-6191809905018816441[0]
+      public open fun openFun1(): kotlin/Unit
+
+      // signature: /OpenClass.openFun2|-6569900631812216745[0]
+      public open fun openFun2(): kotlin/Unit
     }
+  }
 }

native/native.tests/testData/klib/dump-metadata/MethodModality.v2.txt

@@ -1,32 +1,64 @@
-package <root> {
-    // Signature: /AbstractClass|null[0]
-    abstract class AbstractClass constructor() : Interface {
-        // Signature: /AbstractClass.abstractFun|abstractFun(){}[0]
-        abstract fun abstractFun()
-        // Signature: /AbstractClass.interfaceFun|interfaceFun(){}[0]
-        override fun interfaceFun()
+library {
+  // module name: <MethodModality.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: AbstractClass
+    // class name: FinalClass
+    // class name: Interface
+    // class name: OpenClass
+
+    // signature: /AbstractClass|null[0]
+    public abstract class AbstractClass : Interface {
+
+      // signature: /AbstractClass.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /AbstractClass.abstractFun|abstractFun(){}[0]
+      public abstract fun abstractFun(): kotlin/Unit
+
+      // signature: /AbstractClass.interfaceFun|interfaceFun(){}[0]
+      public open fun interfaceFun(): kotlin/Unit
     }
-    // Signature: /FinalClass|null[0]
-    class FinalClass constructor() : OpenClass {
-        // Signature: /FinalClass.openFun1|openFun1(){}[0]
-        override fun openFun1()
-        // Signature: /FinalClass.openFun2|openFun2(){}[0]
-        final override fun openFun2()
+
+    // signature: /FinalClass|null[0]
+    public final class FinalClass : OpenClass {
+
+      // signature: /FinalClass.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /FinalClass.openFun1|openFun1(){}[0]
+      public open fun openFun1(): kotlin/Unit
+
+      // signature: /FinalClass.openFun2|openFun2(){}[0]
+      public final fun openFun2(): kotlin/Unit
     }
-    // Signature: /Interface|null[0]
-    interface Interface {
-        // Signature: /Interface.interfaceFun|interfaceFun(){}[0]
-        fun interfaceFun()
+
+    // signature: /Interface|null[0]
+    public abstract interface Interface : kotlin/Any {
+
+      // signature: /Interface.interfaceFun|interfaceFun(){}[0]
+      public abstract fun interfaceFun(): kotlin/Unit
     }
-    // Signature: /OpenClass|null[0]
-    open class OpenClass constructor() : AbstractClass {
-        // Signature: /OpenClass.abstractFun|abstractFun(){}[0]
-        override fun abstractFun()
-        // Signature: /OpenClass.finalFun|finalFun(){}[0]
-        fun finalFun()
-        // Signature: /OpenClass.openFun1|openFun1(){}[0]
-        open fun openFun1()
-        // Signature: /OpenClass.openFun2|openFun2(){}[0]
-        open fun openFun2()
+
+    // signature: /OpenClass|null[0]
+    public open class OpenClass : AbstractClass {
+
+      // signature: /OpenClass.<init>|<init>(){}[0]
+      public constructor()
+
+      // signature: /OpenClass.abstractFun|abstractFun(){}[0]
+      public open fun abstractFun(): kotlin/Unit
+
+      // signature: /OpenClass.finalFun|finalFun(){}[0]
+      public final fun finalFun(): kotlin/Unit
+
+      // signature: /OpenClass.openFun1|openFun1(){}[0]
+      public open fun openFun1(): kotlin/Unit
+
+      // signature: /OpenClass.openFun2|openFun2(){}[0]
+      public open fun openFun2(): kotlin/Unit
     }
+  }
 }

native/native.tests/testData/klib/dump-metadata/Objects.fir.txt

@@ -0,0 +1,62 @@
+library {
+  // module name: <Objects.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: B
+    // class name: B.C
+    // class name: B.Companion
+    // class name: D
+    // class name: D.E
+
+    public final object A : kotlin/Any {
+
+      private constructor()
+
+      public final fun a(): kotlin/Unit
+    }
+
+    public final class B : kotlin/Any {
+
+      public constructor()
+
+      // companion object: Companion
+
+      // nested class: Companion
+
+      // nested class: C
+    }
+
+    public final object B.C : kotlin/Any {
+
+      private constructor()
+
+      public final fun c(): kotlin/Unit
+    }
+
+    public final companion object B.Companion : kotlin/Any {
+
+      private constructor()
+
+      public final fun b(): kotlin/Unit
+    }
+
+    public final class D : kotlin/Any {
+
+      public constructor()
+
+      // companion object: E
+
+      // nested class: E
+    }
+
+    public final companion object D.E : kotlin/Any {
+
+      private constructor()
+
+      public final fun e(): kotlin/Unit
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Objects.txt

@@ -1,18 +0,0 @@
-package <root> {
-    object A {
-        fun a()
-    }
-    class B constructor() {
-        companion object {
-            fun b()
-        }
-        object C {
-            fun c()
-        }
-    }
-    class D constructor() {
-        companion object E {
-            fun e()
-        }
-    }
-}

native/native.tests/testData/klib/dump-metadata/Objects.v1.fir.txt

@@ -0,0 +1,78 @@
+library {
+  // module name: <Objects.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: B
+    // class name: B.C
+    // class name: B.Companion
+    // class name: D
+    // class name: D.E
+
+    // signature: /A|null[0]
+    public final object A : kotlin/Any {
+
+      // signature: /A.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: /A.a|-4432112437378250461[0]
+      public final fun a(): kotlin/Unit
+    }
+
+    // signature: /B|null[0]
+    public final class B : kotlin/Any {
+
+      // signature: /B.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // companion object: Companion
+
+      // nested class: Companion
+
+      // nested class: C
+    }
+
+    // signature: /B.C|null[0]
+    public final object B.C : kotlin/Any {
+
+      // signature: /B.C.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: /B.C.c|-2724918380551733646[0]
+      public final fun c(): kotlin/Unit
+    }
+
+    // signature: /B.Companion|null[0]
+    public final companion object B.Companion : kotlin/Any {
+
+      // signature: /B.Companion.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: /B.Companion.b|4789657038926421504[0]
+      public final fun b(): kotlin/Unit
+    }
+
+    // signature: /D|null[0]
+    public final class D : kotlin/Any {
+
+      // signature: /D.<init>|-5645683436151566731[0]
+      public constructor()
+
+      // companion object: E
+
+      // nested class: E
+    }
+
+    // signature: /D.E|null[0]
+    public final companion object D.E : kotlin/Any {
+
+      // signature: /D.E.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: /D.E.e|-4971306249673273083[0]
+      public final fun e(): kotlin/Unit
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Objects.v1.txt

@@ -1,28 +0,0 @@
-package <root> {
-    // Signature: /A|null[0]
-    object A {
-        // Signature: /A.a|-4432112437378250461[0]
-        fun a()
-    }
-    // Signature: /B|null[0]
-    class B constructor() {
-        // Signature: /B.Companion|null[0]
-        companion object {
-            // Signature: /B.Companion.b|4789657038926421504[0]
-            fun b()
-        }
-        // Signature: /B.C|null[0]
-        object C {
-            // Signature: /B.C.c|-2724918380551733646[0]
-            fun c()
-        }
-    }
-    // Signature: /D|null[0]
-    class D constructor() {
-        // Signature: /D.E|null[0]
-        companion object E {
-            // Signature: /D.E.e|-4971306249673273083[0]
-            fun e()
-        }
-    }
-}

native/native.tests/testData/klib/dump-metadata/Objects.v2.fir.txt

@@ -0,0 +1,78 @@
+library {
+  // module name: <Objects.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: B
+    // class name: B.C
+    // class name: B.Companion
+    // class name: D
+    // class name: D.E
+
+    // signature: /A|null[0]
+    public final object A : kotlin/Any {
+
+      // signature: /A.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: /A.a|a(){}[0]
+      public final fun a(): kotlin/Unit
+    }
+
+    // signature: /B|null[0]
+    public final class B : kotlin/Any {
+
+      // signature: /B.<init>|<init>(){}[0]
+      public constructor()
+
+      // companion object: Companion
+
+      // nested class: Companion
+
+      // nested class: C
+    }
+
+    // signature: /B.C|null[0]
+    public final object B.C : kotlin/Any {
+
+      // signature: /B.C.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: /B.C.c|c(){}[0]
+      public final fun c(): kotlin/Unit
+    }
+
+    // signature: /B.Companion|null[0]
+    public final companion object B.Companion : kotlin/Any {
+
+      // signature: /B.Companion.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: /B.Companion.b|b(){}[0]
+      public final fun b(): kotlin/Unit
+    }
+
+    // signature: /D|null[0]
+    public final class D : kotlin/Any {
+
+      // signature: /D.<init>|<init>(){}[0]
+      public constructor()
+
+      // companion object: E
+
+      // nested class: E
+    }
+
+    // signature: /D.E|null[0]
+    public final companion object D.E : kotlin/Any {
+
+      // signature: /D.E.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: /D.E.e|e(){}[0]
+      public final fun e(): kotlin/Unit
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/Objects.v2.txt

@@ -1,28 +0,0 @@
-package <root> {
-    // Signature: /A|null[0]
-    object A {
-        // Signature: /A.a|a(){}[0]
-        fun a()
-    }
-    // Signature: /B|null[0]
-    class B constructor() {
-        // Signature: /B.Companion|null[0]
-        companion object {
-            // Signature: /B.Companion.b|b(){}[0]
-            fun b()
-        }
-        // Signature: /B.C|null[0]
-        object C {
-            // Signature: /B.C.c|c(){}[0]
-            fun c()
-        }
-    }
-    // Signature: /D|null[0]
-    class D constructor() {
-        // Signature: /D.E|null[0]
-        companion object E {
-            // Signature: /D.E.e|e(){}[0]
-            fun e()
-        }
-    }
-}

native/native.tests/testData/klib/dump-metadata/TopLevelFunctions.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 @file:Suppress("UNUSED_PARAMETER")
 
 annotation class A

native/native.tests/testData/klib/dump-metadata/TopLevelFunctions.txt

@@ -1,21 +1,63 @@
-package <root> {
-    annotation class A constructor() : Annotation
-    annotation class B constructor() : Annotation
-    class Foo constructor()
-    @A @B fun a()
-    fun Foo.e()
-    fun f1(x: Foo)
-    fun f2(x: Foo, y: Foo): Int
-    inline fun i1(block: () -> Foo)
-    inline fun i2(noinline block: () -> Foo)
-    inline fun i3(crossinline block: () -> Foo)
-    fun i4(block: (Foo) -> Int)
-    fun i5(block: (Foo, Foo) -> Int)
-    fun i6(block: Foo.() -> Int)
-    fun i7(block: Foo.(Foo) -> Int)
-    fun <T> t1(x: Foo)
-    fun <T> t2(x: T)
-    fun <T, F> t3(x: T, y: F)
-    inline fun <reified T> t4(x: T)
-    fun <T : Number> t5(x: T)
-}
+library {
+  // module name: <TopLevelFunctions.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: B
+    // class name: Foo
+
+    public final annotation class A : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class B : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final class Foo : kotlin/Any {
+
+      public constructor()
+    }
+
+    package {
+
+      @A
+      @B
+      public final fun a(): kotlin/Unit
+
+      public final fun Foo.e(): kotlin/Unit
+
+      public final fun f1(x: Foo): kotlin/Unit
+
+      public final fun f2(x: Foo, y: Foo): kotlin/Int
+
+      public final inline fun i1(block: kotlin/Function0<Foo>): kotlin/Unit
+
+      public final inline fun i2(noinline block: kotlin/Function0<Foo>): kotlin/Unit
+
+      public final inline fun i3(crossinline block: kotlin/Function0<Foo>): kotlin/Unit
+
+      public final fun i4(block: kotlin/Function1<Foo, kotlin/Int>): kotlin/Unit
+
+      public final fun i5(block: kotlin/Function2<Foo, Foo, kotlin/Int>): kotlin/Unit
+
+      public final fun i6(block: @kotlin/ExtensionFunctionType kotlin/Function1<Foo, kotlin/Int>): kotlin/Unit
+
+      public final fun i7(block: @kotlin/ExtensionFunctionType kotlin/Function2<Foo, Foo, kotlin/Int>): kotlin/Unit
+
+      public final fun <T#0 /* T */> t1(x: Foo): kotlin/Unit
+
+      public final fun <T#0 /* T */> t2(x: T#0): kotlin/Unit
+
+      public final fun <T#0 /* T */, T#1 /* F */> t3(x: T#0, y: T#1): kotlin/Unit
+
+      public final inline fun <reified T#0 /* T */> t4(x: T#0): kotlin/Unit
+
+      public final fun <T#0 /* T */ : kotlin/Number> t5(x: T#0): kotlin/Unit
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/TopLevelFunctions.v1.txt

@@ -1,40 +1,85 @@
-package <root> {
-    // Signature: /A|null[0]
-    annotation class A constructor() : Annotation
-    // Signature: /B|null[0]
-    annotation class B constructor() : Annotation
-    // Signature: /Foo|null[0]
-    class Foo constructor()
-    // Signature: /a|-4432112437378250461[0]
-    @A @B fun a()
-    // Signature: /e|8989066053884186758[0]
-    fun Foo.e()
-    // Signature: /f1|-1560136604489335247[0]
-    fun f1(x: Foo)
-    // Signature: /f2|8193757935438764272[0]
-    fun f2(x: Foo, y: Foo): Int
-    // Signature: /i1|-6444280688669682335[0]
-    inline fun i1(block: () -> Foo)
-    // Signature: /i2|-6849364972861294160[0]
-    inline fun i2(noinline block: () -> Foo)
-    // Signature: /i3|-3309425284353652160[0]
-    inline fun i3(crossinline block: () -> Foo)
-    // Signature: /i4|-6304681376176934836[0]
-    fun i4(block: (Foo) -> Int)
-    // Signature: /i5|-3051198308501003303[0]
-    fun i5(block: (Foo, Foo) -> Int)
-    // Signature: /i6|6453956519947412951[0]
-    fun i6(block: Foo.() -> Int)
-    // Signature: /i7|-2413842829876213778[0]
-    fun i7(block: Foo.(Foo) -> Int)
-    // Signature: /t1|4730456697336757969[0]
-    fun <T> t1(x: Foo)
-    // Signature: /t2|-90499170678395935[0]
-    fun <T> t2(x: T)
-    // Signature: /t3|7012475377071720756[0]
-    fun <T, F> t3(x: T, y: F)
-    // Signature: /t4|-3843581059144476593[0]
-    inline fun <reified T> t4(x: T)
-    // Signature: /t5|236307131019209421[0]
-    fun <T : Number> t5(x: T)
+library {
+  // module name: <TopLevelFunctions.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: B
+    // class name: Foo
+
+    // signature: /A|null[0]
+    public final annotation class A : kotlin/Annotation {
+
+      // signature: /A.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: /B|null[0]
+    public final annotation class B : kotlin/Annotation {
+
+      // signature: /B.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    package {
+
+      // signature: /a|-4432112437378250461[0]
+      @A
+      @B
+      public final fun a(): kotlin/Unit
+
+      // signature: /e|8989066053884186758[0]
+      public final fun Foo.e(): kotlin/Unit
+
+      // signature: /f1|-1560136604489335247[0]
+      public final fun f1(x: Foo): kotlin/Unit
+
+      // signature: /f2|8193757935438764272[0]
+      public final fun f2(x: Foo, y: Foo): kotlin/Int
+
+      // signature: /i1|-6444280688669682335[0]
+      public final inline fun i1(block: kotlin/Function0<Foo>): kotlin/Unit
+
+      // signature: /i2|-6849364972861294160[0]
+      public final inline fun i2(noinline block: kotlin/Function0<Foo>): kotlin/Unit
+
+      // signature: /i3|-3309425284353652160[0]
+      public final inline fun i3(crossinline block: kotlin/Function0<Foo>): kotlin/Unit
+
+      // signature: /i4|-6304681376176934836[0]
+      public final fun i4(block: kotlin/Function1<Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /i5|-3051198308501003303[0]
+      public final fun i5(block: kotlin/Function2<Foo, Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /i6|6453956519947412951[0]
+      public final fun i6(block: @kotlin/ExtensionFunctionType kotlin/Function1<Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /i7|-2413842829876213778[0]
+      public final fun i7(block: @kotlin/ExtensionFunctionType kotlin/Function2<Foo, Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /t1|4730456697336757969[0]
+      public final fun <T#0 /* T */> t1(x: Foo): kotlin/Unit
+
+      // signature: /t2|-90499170678395935[0]
+      public final fun <T#0 /* T */> t2(x: T#0): kotlin/Unit
+
+      // signature: /t3|7012475377071720756[0]
+      public final fun <T#0 /* T */, T#1 /* F */> t3(x: T#0, y: T#1): kotlin/Unit
+
+      // signature: /t4|-3843581059144476593[0]
+      public final inline fun <reified T#0 /* T */> t4(x: T#0): kotlin/Unit
+
+      // signature: /t5|236307131019209421[0]
+      public final fun <T#0 /* T */ : kotlin/Number> t5(x: T#0): kotlin/Unit
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelFunctions.v2.txt

@@ -1,40 +1,85 @@
-package <root> {
-    // Signature: /A|null[0]
-    annotation class A constructor() : Annotation
-    // Signature: /B|null[0]
-    annotation class B constructor() : Annotation
-    // Signature: /Foo|null[0]
-    class Foo constructor()
-    // Signature: /a|a(){}[0]
-    @A @B fun a()
-    // Signature: /e|e@Foo(){}[0]
-    fun Foo.e()
-    // Signature: /f1|f1(Foo){}[0]
-    fun f1(x: Foo)
-    // Signature: /f2|f2(Foo;Foo){}[0]
-    fun f2(x: Foo, y: Foo): Int
-    // Signature: /i1|i1(kotlin.Function0<Foo>){}[0]
-    inline fun i1(block: () -> Foo)
-    // Signature: /i2|i2(kotlin.Function0<Foo>){}[0]
-    inline fun i2(noinline block: () -> Foo)
-    // Signature: /i3|i3(kotlin.Function0<Foo>){}[0]
-    inline fun i3(crossinline block: () -> Foo)
-    // Signature: /i4|i4(kotlin.Function1<Foo,kotlin.Int>){}[0]
-    fun i4(block: (Foo) -> Int)
-    // Signature: /i5|i5(kotlin.Function2<Foo,Foo,kotlin.Int>){}[0]
-    fun i5(block: (Foo, Foo) -> Int)
-    // Signature: /i6|i6(kotlin.Function1<Foo,kotlin.Int>){}[0]
-    fun i6(block: Foo.() -> Int)
-    // Signature: /i7|i7(kotlin.Function2<Foo,Foo,kotlin.Int>){}[0]
-    fun i7(block: Foo.(Foo) -> Int)
-    // Signature: /t1|t1(Foo){0§<kotlin.Any?>}[0]
-    fun <T> t1(x: Foo)
-    // Signature: /t2|t2(0:0){0§<kotlin.Any?>}[0]
-    fun <T> t2(x: T)
-    // Signature: /t3|t3(0:0;0:1){0§<kotlin.Any?>;1§<kotlin.Any?>}[0]
-    fun <T, F> t3(x: T, y: F)
-    // Signature: /t4|t4(0:0){0§<kotlin.Any?>}[0]
-    inline fun <reified T> t4(x: T)
-    // Signature: /t5|t5(0:0){0§<kotlin.Number>}[0]
-    fun <T : Number> t5(x: T)
+library {
+  // module name: <TopLevelFunctions.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: A
+    // class name: B
+    // class name: Foo
+
+    // signature: /A|null[0]
+    public final annotation class A : kotlin/Annotation {
+
+      // signature: /A.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: /B|null[0]
+    public final annotation class B : kotlin/Annotation {
+
+      // signature: /B.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    package {
+
+      // signature: /a|a(){}[0]
+      @A
+      @B
+      public final fun a(): kotlin/Unit
+
+      // signature: /e|e@Foo(){}[0]
+      public final fun Foo.e(): kotlin/Unit
+
+      // signature: /f1|f1(Foo){}[0]
+      public final fun f1(x: Foo): kotlin/Unit
+
+      // signature: /f2|f2(Foo;Foo){}[0]
+      public final fun f2(x: Foo, y: Foo): kotlin/Int
+
+      // signature: /i1|i1(kotlin.Function0<Foo>){}[0]
+      public final inline fun i1(block: kotlin/Function0<Foo>): kotlin/Unit
+
+      // signature: /i2|i2(kotlin.Function0<Foo>){}[0]
+      public final inline fun i2(noinline block: kotlin/Function0<Foo>): kotlin/Unit
+
+      // signature: /i3|i3(kotlin.Function0<Foo>){}[0]
+      public final inline fun i3(crossinline block: kotlin/Function0<Foo>): kotlin/Unit
+
+      // signature: /i4|i4(kotlin.Function1<Foo,kotlin.Int>){}[0]
+      public final fun i4(block: kotlin/Function1<Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /i5|i5(kotlin.Function2<Foo,Foo,kotlin.Int>){}[0]
+      public final fun i5(block: kotlin/Function2<Foo, Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /i6|i6(kotlin.Function1<Foo,kotlin.Int>){}[0]
+      public final fun i6(block: @kotlin/ExtensionFunctionType kotlin/Function1<Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /i7|i7(kotlin.Function2<Foo,Foo,kotlin.Int>){}[0]
+      public final fun i7(block: @kotlin/ExtensionFunctionType kotlin/Function2<Foo, Foo, kotlin/Int>): kotlin/Unit
+
+      // signature: /t1|t1(Foo){0§<kotlin.Any?>}[0]
+      public final fun <T#0 /* T */> t1(x: Foo): kotlin/Unit
+
+      // signature: /t2|t2(0:0){0§<kotlin.Any?>}[0]
+      public final fun <T#0 /* T */> t2(x: T#0): kotlin/Unit
+
+      // signature: /t3|t3(0:0;0:1){0§<kotlin.Any?>;1§<kotlin.Any?>}[0]
+      public final fun <T#0 /* T */, T#1 /* F */> t3(x: T#0, y: T#1): kotlin/Unit
+
+      // signature: /t4|t4(0:0){0§<kotlin.Any?>}[0]
+      public final inline fun <reified T#0 /* T */> t4(x: T#0): kotlin/Unit
+
+      // signature: /t5|t5(0:0){0§<kotlin.Number>}[0]
+      public final fun <T#0 /* T */ : kotlin/Number> t5(x: T#0): kotlin/Unit
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesCustomPackage.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 @file:Suppress("UNUSED_PARAMETER")
 
 package custom.pkg

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesCustomPackage.txt

@@ -1,7 +1,24 @@
-package custom.pkg {
-    typealias MyTransformer = (String) -> Int
-    val v1: Int = 1
-    val v2: String = "hello"
-    val v3: (String) -> Int
-    val v4: MyTransformer /* = (String) -> Int */
-}
+library {
+  // module name: <TopLevelPropertiesCustomPackage.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    package {
+
+      public final val v1: kotlin/Int /* = 1 */
+        public final get
+
+      public final val v2: kotlin/String /* = "hello" */
+        public final get
+
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        public final get
+
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = custom/pkg/MyTransformer^ */
+        public final get
+
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesCustomPackage.v1.txt

@@ -1,12 +1,33 @@
-package custom.pkg {
-    // Signature: custom.pkg/MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: custom.pkg/v1|7393439784805956893[0]
-    val v1: Int = 1
-    // Signature: custom.pkg/v2|-7674839086071973207[0]
-    val v2: String = "hello"
-    // Signature: custom.pkg/v3|1020778405567015018[0]
-    val v3: (String) -> Int
-    // Signature: custom.pkg/v4|8662652590067501092[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesCustomPackage.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    package {
+
+      // signature: custom.pkg/v1|7393439784805956893[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: custom.pkg/v1.<get-v1>|6078408232880608613[0]
+        public final get
+
+      // signature: custom.pkg/v2|-7674839086071973207[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: custom.pkg/v2.<get-v2>|-1626959823585604055[0]
+        public final get
+
+      // signature: custom.pkg/v3|1020778405567015018[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: custom.pkg/v3.<get-v3>|-8677319744655558329[0]
+        public final get
+
+      // signature: custom.pkg/v4|8662652590067501092[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = custom/pkg/MyTransformer^ */
+        // signature: custom.pkg/v4.<get-v4>|-8872551565527715335[0]
+        public final get
+
+      // signature: custom.pkg/MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesCustomPackage.v2.txt

@@ -1,12 +1,33 @@
-package custom.pkg {
-    // Signature: custom.pkg/MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: custom.pkg/v1|{}v1[0]
-    val v1: Int = 1
-    // Signature: custom.pkg/v2|{}v2[0]
-    val v2: String = "hello"
-    // Signature: custom.pkg/v3|{}v3[0]
-    val v3: (String) -> Int
-    // Signature: custom.pkg/v4|{}v4[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesCustomPackage.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    package {
+
+      // signature: custom.pkg/v1|{}v1[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: custom.pkg/v1.<get-v1>|<get-v1>(){}[0]
+        public final get
+
+      // signature: custom.pkg/v2|{}v2[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: custom.pkg/v2.<get-v2>|<get-v2>(){}[0]
+        public final get
+
+      // signature: custom.pkg/v3|{}v3[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: custom.pkg/v3.<get-v3>|<get-v3>(){}[0]
+        public final get
+
+      // signature: custom.pkg/v4|{}v4[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = custom/pkg/MyTransformer^ */
+        // signature: custom.pkg/v4.<get-v4>|<get-v4>(){}[0]
+        public final get
+
+      // signature: custom.pkg/MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesRootPackage.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 @file:Suppress("UNUSED_PARAMETER")
 
 typealias MyTransformer = (String) -> Int

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesRootPackage.txt

@@ -1,7 +1,24 @@
-package <root> {
-    typealias MyTransformer = (String) -> Int
-    val v1: Int = 1
-    val v2: String = "hello"
-    val v3: (String) -> Int
-    val v4: MyTransformer /* = (String) -> Int */
-}
+library {
+  // module name: <TopLevelPropertiesRootPackage.kt>
+
+  library fragment {
+    // package name: <root>
+
+    package {
+
+      public final val v1: kotlin/Int /* = 1 */
+        public final get
+
+      public final val v2: kotlin/String /* = "hello" */
+        public final get
+
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        public final get
+
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = MyTransformer^ */
+        public final get
+
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesRootPackage.v1.txt

@@ -1,12 +1,33 @@
-package <root> {
-    // Signature: /MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: /v1|7393439784805956893[0]
-    val v1: Int = 1
-    // Signature: /v2|-7674839086071973207[0]
-    val v2: String = "hello"
-    // Signature: /v3|1020778405567015018[0]
-    val v3: (String) -> Int
-    // Signature: /v4|8662652590067501092[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesRootPackage.kt>
+
+  library fragment {
+    // package name: <root>
+
+    package {
+
+      // signature: /v1|7393439784805956893[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: /v1.<get-v1>|6078408232880608613[0]
+        public final get
+
+      // signature: /v2|-7674839086071973207[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: /v2.<get-v2>|-1626959823585604055[0]
+        public final get
+
+      // signature: /v3|1020778405567015018[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: /v3.<get-v3>|-8677319744655558329[0]
+        public final get
+
+      // signature: /v4|8662652590067501092[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = MyTransformer^ */
+        // signature: /v4.<get-v4>|-8872551565527715335[0]
+        public final get
+
+      // signature: /MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesRootPackage.v2.txt

@@ -1,12 +1,33 @@
-package <root> {
-    // Signature: /MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: /v1|{}v1[0]
-    val v1: Int = 1
-    // Signature: /v2|{}v2[0]
-    val v2: String = "hello"
-    // Signature: /v3|{}v3[0]
-    val v3: (String) -> Int
-    // Signature: /v4|{}v4[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesRootPackage.kt>
+
+  library fragment {
+    // package name: <root>
+
+    package {
+
+      // signature: /v1|{}v1[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: /v1.<get-v1>|<get-v1>(){}[0]
+        public final get
+
+      // signature: /v2|{}v2[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: /v2.<get-v2>|<get-v2>(){}[0]
+        public final get
+
+      // signature: /v3|{}v3[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: /v3.<get-v3>|<get-v3>(){}[0]
+        public final get
+
+      // signature: /v4|{}v4[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = MyTransformer^ */
+        // signature: /v4.<get-v4>|<get-v4>(){}[0]
+        public final get
+
+      // signature: /MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesCustomPackage.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 @file:Suppress("UNUSED_PARAMETER")
 
 package custom.pkg

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesCustomPackage.txt

@@ -1,9 +1,37 @@
-package custom.pkg {
-    object Bar
-    class Foo constructor()
-    typealias MyTransformer = (String) -> Int
-    val v1: Int = 1
-    val v2: String = "hello"
-    val v3: (String) -> Int
-    val v4: MyTransformer /* = (String) -> Int */
-}
+library {
+  // module name: <TopLevelPropertiesWithClassesCustomPackage.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/Bar
+    // class name: custom/pkg/Foo
+
+    public final object custom/pkg/Bar : kotlin/Any {
+
+      private constructor()
+    }
+
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      public constructor()
+    }
+
+    package {
+
+      public final val v1: kotlin/Int /* = 1 */
+        public final get
+
+      public final val v2: kotlin/String /* = "hello" */
+        public final get
+
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        public final get
+
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = custom/pkg/MyTransformer^ */
+        public final get
+
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesCustomPackage.v1.txt

@@ -1,16 +1,50 @@
-package custom.pkg {
-    // Signature: custom.pkg/Bar|null[0]
-    object Bar
-    // Signature: custom.pkg/Foo|null[0]
-    class Foo constructor()
-    // Signature: custom.pkg/MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: custom.pkg/v1|7393439784805956893[0]
-    val v1: Int = 1
-    // Signature: custom.pkg/v2|-7674839086071973207[0]
-    val v2: String = "hello"
-    // Signature: custom.pkg/v3|1020778405567015018[0]
-    val v3: (String) -> Int
-    // Signature: custom.pkg/v4|8662652590067501092[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesWithClassesCustomPackage.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/Bar
+    // class name: custom/pkg/Foo
+
+    // signature: custom.pkg/Bar|null[0]
+    public final object custom/pkg/Bar : kotlin/Any {
+
+      // signature: custom.pkg/Bar.<init>|-5645683436151566731[0]
+      private constructor()
+    }
+
+    // signature: custom.pkg/Foo|null[0]
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      // signature: custom.pkg/Foo.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    package {
+
+      // signature: custom.pkg/v1|7393439784805956893[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: custom.pkg/v1.<get-v1>|6078408232880608613[0]
+        public final get
+
+      // signature: custom.pkg/v2|-7674839086071973207[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: custom.pkg/v2.<get-v2>|-1626959823585604055[0]
+        public final get
+
+      // signature: custom.pkg/v3|1020778405567015018[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: custom.pkg/v3.<get-v3>|-8677319744655558329[0]
+        public final get
+
+      // signature: custom.pkg/v4|8662652590067501092[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = custom/pkg/MyTransformer^ */
+        // signature: custom.pkg/v4.<get-v4>|-8872551565527715335[0]
+        public final get
+
+      // signature: custom.pkg/MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesCustomPackage.v2.txt

@@ -1,16 +1,50 @@
-package custom.pkg {
-    // Signature: custom.pkg/Bar|null[0]
-    object Bar
-    // Signature: custom.pkg/Foo|null[0]
-    class Foo constructor()
-    // Signature: custom.pkg/MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: custom.pkg/v1|{}v1[0]
-    val v1: Int = 1
-    // Signature: custom.pkg/v2|{}v2[0]
-    val v2: String = "hello"
-    // Signature: custom.pkg/v3|{}v3[0]
-    val v3: (String) -> Int
-    // Signature: custom.pkg/v4|{}v4[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesWithClassesCustomPackage.kt>
+
+  library fragment {
+    // package name: custom.pkg
+
+    // class name: custom/pkg/Bar
+    // class name: custom/pkg/Foo
+
+    // signature: custom.pkg/Bar|null[0]
+    public final object custom/pkg/Bar : kotlin/Any {
+
+      // signature: custom.pkg/Bar.<init>|<init>(){}[0]
+      private constructor()
+    }
+
+    // signature: custom.pkg/Foo|null[0]
+    public final class custom/pkg/Foo : kotlin/Any {
+
+      // signature: custom.pkg/Foo.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    package {
+
+      // signature: custom.pkg/v1|{}v1[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: custom.pkg/v1.<get-v1>|<get-v1>(){}[0]
+        public final get
+
+      // signature: custom.pkg/v2|{}v2[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: custom.pkg/v2.<get-v2>|<get-v2>(){}[0]
+        public final get
+
+      // signature: custom.pkg/v3|{}v3[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: custom.pkg/v3.<get-v3>|<get-v3>(){}[0]
+        public final get
+
+      // signature: custom.pkg/v4|{}v4[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = custom/pkg/MyTransformer^ */
+        // signature: custom.pkg/v4.<get-v4>|<get-v4>(){}[0]
+        public final get
+
+      // signature: custom.pkg/MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesRootPackage.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 @file:Suppress("UNUSED_PARAMETER")
 
 class Foo

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesRootPackage.txt

@@ -1,9 +1,37 @@
-package <root> {
-    object Bar
-    class Foo constructor()
-    typealias MyTransformer = (String) -> Int
-    val v1: Int = 1
-    val v2: String = "hello"
-    val v3: (String) -> Int
-    val v4: MyTransformer /* = (String) -> Int */
-}
+library {
+  // module name: <TopLevelPropertiesWithClassesRootPackage.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: Bar
+    // class name: Foo
+
+    public final object Bar : kotlin/Any {
+
+      private constructor()
+    }
+
+    public final class Foo : kotlin/Any {
+
+      public constructor()
+    }
+
+    package {
+
+      public final val v1: kotlin/Int /* = 1 */
+        public final get
+
+      public final val v2: kotlin/String /* = "hello" */
+        public final get
+
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        public final get
+
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = MyTransformer^ */
+        public final get
+
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesRootPackage.v1.txt

@@ -1,16 +1,50 @@
-package <root> {
-    // Signature: /Bar|null[0]
-    object Bar
-    // Signature: /Foo|null[0]
-    class Foo constructor()
-    // Signature: /MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: /v1|7393439784805956893[0]
-    val v1: Int = 1
-    // Signature: /v2|-7674839086071973207[0]
-    val v2: String = "hello"
-    // Signature: /v3|1020778405567015018[0]
-    val v3: (String) -> Int
-    // Signature: /v4|8662652590067501092[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesWithClassesRootPackage.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: Bar
+    // class name: Foo
+
+    // signature: /Bar|null[0]
+    public final object Bar : kotlin/Any {
+
+      // signature: /Bar.<init>|-5645683436151566731[0]
+      private constructor()
+    }
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    package {
+
+      // signature: /v1|7393439784805956893[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: /v1.<get-v1>|6078408232880608613[0]
+        public final get
+
+      // signature: /v2|-7674839086071973207[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: /v2.<get-v2>|-1626959823585604055[0]
+        public final get
+
+      // signature: /v3|1020778405567015018[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: /v3.<get-v3>|-8677319744655558329[0]
+        public final get
+
+      // signature: /v4|8662652590067501092[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = MyTransformer^ */
+        // signature: /v4.<get-v4>|-8872551565527715335[0]
+        public final get
+
+      // signature: /MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/TopLevelPropertiesWithClassesRootPackage.v2.txt

@@ -1,16 +1,50 @@
-package <root> {
-    // Signature: /Bar|null[0]
-    object Bar
-    // Signature: /Foo|null[0]
-    class Foo constructor()
-    // Signature: /MyTransformer|null[0]
-    typealias MyTransformer = (String) -> Int
-    // Signature: /v1|{}v1[0]
-    val v1: Int = 1
-    // Signature: /v2|{}v2[0]
-    val v2: String = "hello"
-    // Signature: /v3|{}v3[0]
-    val v3: (String) -> Int
-    // Signature: /v4|{}v4[0]
-    val v4: MyTransformer /* = (String) -> Int */
+library {
+  // module name: <TopLevelPropertiesWithClassesRootPackage.kt>
+
+  library fragment {
+    // package name: <root>
+
+    // class name: Bar
+    // class name: Foo
+
+    // signature: /Bar|null[0]
+    public final object Bar : kotlin/Any {
+
+      // signature: /Bar.<init>|<init>(){}[0]
+      private constructor()
+    }
+
+    // signature: /Foo|null[0]
+    public final class Foo : kotlin/Any {
+
+      // signature: /Foo.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    package {
+
+      // signature: /v1|{}v1[0]
+      public final val v1: kotlin/Int /* = 1 */
+        // signature: /v1.<get-v1>|<get-v1>(){}[0]
+        public final get
+
+      // signature: /v2|{}v2[0]
+      public final val v2: kotlin/String /* = "hello" */
+        // signature: /v2.<get-v2>|<get-v2>(){}[0]
+        public final get
+
+      // signature: /v3|{}v3[0]
+      public final val v3: kotlin/Function1<kotlin/String, kotlin/Int>
+        // signature: /v3.<get-v3>|<get-v3>(){}[0]
+        public final get
+
+      // signature: /v4|{}v4[0]
+      public final val v4: kotlin/Function1<kotlin/String, kotlin/Int> /* = MyTransformer^ */
+        // signature: /v4.<get-v4>|<get-v4>(){}[0]
+        public final get
+
+      // signature: /MyTransformer|null[0]
+      public typealias MyTransformer = kotlin/Function1<kotlin/String, kotlin/Int> /* = kotlin/Function1<kotlin/String, kotlin/Int> */
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/annotations.txt

@@ -1,32 +1,160 @@
-package test {
-    annotation class AnnoBackingField constructor() : Annotation
-    annotation class AnnoClass constructor() : Annotation
-    @Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) annotation class AnnoClassTypeParameter constructor() : Annotation
-    @Target(allowedTargets = {AnnotationTarget.TYPE}) annotation class AnnoClassUsageTypeParameter constructor() : Annotation
-    annotation class AnnoConstructor constructor() : Annotation
-    annotation class AnnoConstructorParameter constructor() : Annotation
-    annotation class AnnoDelegatedField constructor() : Annotation
-    annotation class AnnoFunction constructor() : Annotation
-    annotation class AnnoFunctionExtensionReceiver constructor() : Annotation
-    annotation class AnnoFunctionParam constructor() : Annotation
-    @Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) annotation class AnnoFunctionTypeParameter constructor() : Annotation
-    annotation class AnnoGetter constructor() : Annotation
-    annotation class AnnoProperty constructor() : Annotation
-    annotation class AnnoPropertyExtensionReceiver constructor() : Annotation
-    annotation class AnnoSetParam constructor() : Annotation
-    annotation class AnnoSetParam2 constructor() : Annotation
-    annotation class AnnoSetter constructor() : Annotation
-    annotation class AnnoSetter2 constructor() : Annotation
-    class B<@AnnoClassTypeParameter T> constructor()
-    @AnnoClass class Foo @AnnoConstructor constructor(@AnnoConstructorParameter i: Int) {
-        @delegate:AnnoDelegatedField val immutableProp: Int
-        var mutableProp: Int
-            @AnnoSetter2 set
-        @AnnoProperty @field:AnnoBackingField var prop: Int
-            @AnnoGetter get
-            @AnnoSetter set
+library {
+  // module name: <annotations.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnoBackingField
+    // class name: test/AnnoClass
+    // class name: test/AnnoClassTypeParameter
+    // class name: test/AnnoClassUsageTypeParameter
+    // class name: test/AnnoConstructor
+    // class name: test/AnnoConstructorParameter
+    // class name: test/AnnoDelegatedField
+    // class name: test/AnnoFunction
+    // class name: test/AnnoFunctionExtensionReceiver
+    // class name: test/AnnoFunctionParam
+    // class name: test/AnnoFunctionTypeParameter
+    // class name: test/AnnoGetter
+    // class name: test/AnnoProperty
+    // class name: test/AnnoPropertyExtensionReceiver
+    // class name: test/AnnoSetParam
+    // class name: test/AnnoSetParam2
+    // class name: test/AnnoSetter
+    // class name: test/AnnoSetter2
+    // class name: test/B
+    // class name: test/Foo
+
+    public final annotation class test/AnnoBackingField : kotlin/Annotation {
+
+      public constructor()
     }
-    @AnnoPropertyExtensionReceiver val Foo.extProp: Int
-    @AnnoFunction fun @receiver:AnnoFunctionExtensionReceiver Foo.extfun(@AnnoFunctionParam x: Int)
-    fun <@AnnoFunctionTypeParameter T> f(x: B<@AnnoClassUsageTypeParameter Int>)
-}
+
+    public final annotation class test/AnnoClass : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/AnnoClassTypeParameter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE])
+    public final annotation class test/AnnoClassUsageTypeParameter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoConstructor : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoConstructorParameter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoDelegatedField : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoFunction : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoFunctionExtensionReceiver : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoFunctionParam : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/AnnoFunctionTypeParameter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoGetter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoProperty : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoPropertyExtensionReceiver : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoSetParam : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoSetParam2 : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoSetter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/AnnoSetter2 : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final class test/B<@test/AnnoClassTypeParameter T#0 /* T */> : kotlin/Any {
+
+      public constructor()
+    }
+
+    @test/AnnoClass
+    public final class test/Foo : kotlin/Any {
+
+      @test/AnnoConstructor
+      public constructor(@test/AnnoConstructorParameter i: kotlin/Int)
+
+      public final /* delegated */ val immutableProp: kotlin/Int
+        public final /* non-default */ get
+
+      public final var mutableProp: kotlin/Int
+        public final get
+        @test/AnnoSetter2
+        public final /* non-default */ set(@test/AnnoSetParam2 x: kotlin/Int)
+
+      @test/AnnoProperty
+      public final var prop: kotlin/Int
+        @test/AnnoGetter
+        public final /* non-default */ get
+        @test/AnnoSetter
+        public final /* non-default */ set(@test/AnnoSetParam x: kotlin/Int)
+    }
+
+    package {
+
+      @test/AnnoFunction
+      public final fun test/Foo.extfun(@test/AnnoFunctionParam x: kotlin/Int): kotlin/Unit
+
+      public final fun <@test/AnnoFunctionTypeParameter T#0 /* T */> f(x: test/B<@test/AnnoClassUsageTypeParameter kotlin/Int>): kotlin/Unit
+
+      @test/AnnoPropertyExtensionReceiver
+      public final val test/Foo.extProp: kotlin/Int
+        public final /* non-default */ get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/annotations.v1.txt

@@ -1,61 +1,212 @@
-package test {
-    // Signature: test/AnnoBackingField|null[0]
-    annotation class AnnoBackingField constructor() : Annotation
-    // Signature: test/AnnoClass|null[0]
-    annotation class AnnoClass constructor() : Annotation
-    // Signature: test/AnnoClassTypeParameter|null[0]
-    @Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) annotation class AnnoClassTypeParameter constructor() : Annotation
-    // Signature: test/AnnoClassUsageTypeParameter|null[0]
-    @Target(allowedTargets = {AnnotationTarget.TYPE}) annotation class AnnoClassUsageTypeParameter constructor() : Annotation
-    // Signature: test/AnnoConstructor|null[0]
-    annotation class AnnoConstructor constructor() : Annotation
-    // Signature: test/AnnoConstructorParameter|null[0]
-    annotation class AnnoConstructorParameter constructor() : Annotation
-    // Signature: test/AnnoDelegatedField|null[0]
-    annotation class AnnoDelegatedField constructor() : Annotation
-    // Signature: test/AnnoFunction|null[0]
-    annotation class AnnoFunction constructor() : Annotation
-    // Signature: test/AnnoFunctionExtensionReceiver|null[0]
-    annotation class AnnoFunctionExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoFunctionParam|null[0]
-    annotation class AnnoFunctionParam constructor() : Annotation
-    // Signature: test/AnnoFunctionTypeParameter|null[0]
-    @Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) annotation class AnnoFunctionTypeParameter constructor() : Annotation
-    // Signature: test/AnnoGetter|null[0]
-    annotation class AnnoGetter constructor() : Annotation
-    // Signature: test/AnnoProperty|null[0]
-    annotation class AnnoProperty constructor() : Annotation
-    // Signature: test/AnnoPropertyExtensionReceiver|null[0]
-    annotation class AnnoPropertyExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoSetParam|null[0]
-    annotation class AnnoSetParam constructor() : Annotation
-    // Signature: test/AnnoSetParam2|null[0]
-    annotation class AnnoSetParam2 constructor() : Annotation
-    // Signature: test/AnnoSetter|null[0]
-    annotation class AnnoSetter constructor() : Annotation
-    // Signature: test/AnnoSetter2|null[0]
-    annotation class AnnoSetter2 constructor() : Annotation
-    // Signature: test/B|null[0]
-    class B<@AnnoClassTypeParameter T> constructor()
-    // Signature: test/Foo|null[0]
-    @AnnoClass class Foo @AnnoConstructor constructor(@AnnoConstructorParameter i: Int) {
-        // Signature: test/Foo.immutableProp|-821319779095389209[0]
-        @delegate:AnnoDelegatedField val immutableProp: Int
-        // Signature: test/Foo.mutableProp|1472686943295008822[0]
-        var mutableProp: Int
-            // Signature: test/Foo.mutableProp.<set-mutableProp>|-3965758569411010277[0]
-            @AnnoSetter2 set
-        // Signature: test/Foo.prop|3598315380056892812[0]
-        @AnnoProperty @field:AnnoBackingField var prop: Int
-            // Signature: test/Foo.prop.<get-prop>|-5734736374948136327[0]
-            @AnnoGetter get
-            // Signature: test/Foo.prop.<set-prop>|3724820243841906450[0]
-            @AnnoSetter set
+library {
+  // module name: <annotations.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnoBackingField
+    // class name: test/AnnoClass
+    // class name: test/AnnoClassTypeParameter
+    // class name: test/AnnoClassUsageTypeParameter
+    // class name: test/AnnoConstructor
+    // class name: test/AnnoConstructorParameter
+    // class name: test/AnnoDelegatedField
+    // class name: test/AnnoFunction
+    // class name: test/AnnoFunctionExtensionReceiver
+    // class name: test/AnnoFunctionParam
+    // class name: test/AnnoFunctionTypeParameter
+    // class name: test/AnnoGetter
+    // class name: test/AnnoProperty
+    // class name: test/AnnoPropertyExtensionReceiver
+    // class name: test/AnnoSetParam
+    // class name: test/AnnoSetParam2
+    // class name: test/AnnoSetter
+    // class name: test/AnnoSetter2
+    // class name: test/B
+    // class name: test/Foo
+
+    // signature: test/AnnoBackingField|null[0]
+    public final annotation class test/AnnoBackingField : kotlin/Annotation {
+
+      // signature: test/AnnoBackingField.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: test/extProp|-6867325556440293248[0]
-    @AnnoPropertyExtensionReceiver val Foo.extProp: Int
-    // Signature: test/extfun|-4862331552047794615[0]
-    @AnnoFunction fun @receiver:AnnoFunctionExtensionReceiver Foo.extfun(@AnnoFunctionParam x: Int)
-    // Signature: test/f|-1335249788552583475[0]
-    fun <@AnnoFunctionTypeParameter T> f(x: B<@AnnoClassUsageTypeParameter Int>)
+
+    // signature: test/AnnoClass|null[0]
+    public final annotation class test/AnnoClass : kotlin/Annotation {
+
+      // signature: test/AnnoClass.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoClassTypeParameter|null[0]
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/AnnoClassTypeParameter : kotlin/Annotation {
+
+      // signature: test/AnnoClassTypeParameter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoClassUsageTypeParameter|null[0]
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE])
+    public final annotation class test/AnnoClassUsageTypeParameter : kotlin/Annotation {
+
+      // signature: test/AnnoClassUsageTypeParameter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructor|null[0]
+    public final annotation class test/AnnoConstructor : kotlin/Annotation {
+
+      // signature: test/AnnoConstructor.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructorParameter|null[0]
+    public final annotation class test/AnnoConstructorParameter : kotlin/Annotation {
+
+      // signature: test/AnnoConstructorParameter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoDelegatedField|null[0]
+    public final annotation class test/AnnoDelegatedField : kotlin/Annotation {
+
+      // signature: test/AnnoDelegatedField.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunction|null[0]
+    public final annotation class test/AnnoFunction : kotlin/Annotation {
+
+      // signature: test/AnnoFunction.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionExtensionReceiver|null[0]
+    public final annotation class test/AnnoFunctionExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionExtensionReceiver.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionParam|null[0]
+    public final annotation class test/AnnoFunctionParam : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionParam.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionTypeParameter|null[0]
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/AnnoFunctionTypeParameter : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionTypeParameter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoGetter|null[0]
+    public final annotation class test/AnnoGetter : kotlin/Annotation {
+
+      // signature: test/AnnoGetter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoProperty|null[0]
+    public final annotation class test/AnnoProperty : kotlin/Annotation {
+
+      // signature: test/AnnoProperty.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoPropertyExtensionReceiver|null[0]
+    public final annotation class test/AnnoPropertyExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoPropertyExtensionReceiver.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam|null[0]
+    public final annotation class test/AnnoSetParam : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam2|null[0]
+    public final annotation class test/AnnoSetParam2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter|null[0]
+    public final annotation class test/AnnoSetter : kotlin/Annotation {
+
+      // signature: test/AnnoSetter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter2|null[0]
+    public final annotation class test/AnnoSetter2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetter2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/B|null[0]
+    public final class test/B<@test/AnnoClassTypeParameter T#0 /* T */> : kotlin/Any {
+
+      // signature: test/B.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/Foo|null[0]
+    @test/AnnoClass
+    public final class test/Foo : kotlin/Any {
+
+      // signature: test/Foo.<init>|-5182794243525578284[0]
+      @test/AnnoConstructor
+      public constructor(@test/AnnoConstructorParameter i: kotlin/Int)
+
+      // signature: test/Foo.immutableProp|-821319779095389209[0]
+      public final /* delegated */ val immutableProp: kotlin/Int
+        // signature: test/Foo.immutableProp.<get-immutableProp>|325589445193220939[0]
+        public final /* non-default */ get
+
+      // signature: test/Foo.mutableProp|1472686943295008822[0]
+      public final var mutableProp: kotlin/Int
+        // signature: test/Foo.mutableProp.<get-mutableProp>|-557070840259409057[0]
+        public final get
+        // signature: test/Foo.mutableProp.<set-mutableProp>|-3965758569411010277[0]
+        @test/AnnoSetter2
+        public final /* non-default */ set(@test/AnnoSetParam2 x: kotlin/Int)
+
+      // signature: test/Foo.prop|3598315380056892812[0]
+      @test/AnnoProperty
+      public final var prop: kotlin/Int
+        // signature: test/Foo.prop.<get-prop>|-5734736374948136327[0]
+        @test/AnnoGetter
+        public final /* non-default */ get
+        // signature: test/Foo.prop.<set-prop>|3724820243841906450[0]
+        @test/AnnoSetter
+        public final /* non-default */ set(@test/AnnoSetParam x: kotlin/Int)
+    }
+
+    package {
+
+      // signature: test/extfun|-4862331552047794615[0]
+      @test/AnnoFunction
+      public final fun test/Foo.extfun(@test/AnnoFunctionParam x: kotlin/Int): kotlin/Unit
+
+      // signature: test/f|-1335249788552583475[0]
+      public final fun <@test/AnnoFunctionTypeParameter T#0 /* T */> f(x: test/B<@test/AnnoClassUsageTypeParameter kotlin/Int>): kotlin/Unit
+
+      // signature: test/extProp|-6867325556440293248[0]
+      @test/AnnoPropertyExtensionReceiver
+      public final val test/Foo.extProp: kotlin/Int
+        // signature: test/extProp.<get-extProp>|8446410089263600861[0]
+        public final /* non-default */ get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/annotations.v2.txt

@@ -1,61 +1,212 @@
-package test {
-    // Signature: test/AnnoBackingField|null[0]
-    annotation class AnnoBackingField constructor() : Annotation
-    // Signature: test/AnnoClass|null[0]
-    annotation class AnnoClass constructor() : Annotation
-    // Signature: test/AnnoClassTypeParameter|null[0]
-    @Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) annotation class AnnoClassTypeParameter constructor() : Annotation
-    // Signature: test/AnnoClassUsageTypeParameter|null[0]
-    @Target(allowedTargets = {AnnotationTarget.TYPE}) annotation class AnnoClassUsageTypeParameter constructor() : Annotation
-    // Signature: test/AnnoConstructor|null[0]
-    annotation class AnnoConstructor constructor() : Annotation
-    // Signature: test/AnnoConstructorParameter|null[0]
-    annotation class AnnoConstructorParameter constructor() : Annotation
-    // Signature: test/AnnoDelegatedField|null[0]
-    annotation class AnnoDelegatedField constructor() : Annotation
-    // Signature: test/AnnoFunction|null[0]
-    annotation class AnnoFunction constructor() : Annotation
-    // Signature: test/AnnoFunctionExtensionReceiver|null[0]
-    annotation class AnnoFunctionExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoFunctionParam|null[0]
-    annotation class AnnoFunctionParam constructor() : Annotation
-    // Signature: test/AnnoFunctionTypeParameter|null[0]
-    @Target(allowedTargets = {AnnotationTarget.TYPE_PARAMETER}) annotation class AnnoFunctionTypeParameter constructor() : Annotation
-    // Signature: test/AnnoGetter|null[0]
-    annotation class AnnoGetter constructor() : Annotation
-    // Signature: test/AnnoProperty|null[0]
-    annotation class AnnoProperty constructor() : Annotation
-    // Signature: test/AnnoPropertyExtensionReceiver|null[0]
-    annotation class AnnoPropertyExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoSetParam|null[0]
-    annotation class AnnoSetParam constructor() : Annotation
-    // Signature: test/AnnoSetParam2|null[0]
-    annotation class AnnoSetParam2 constructor() : Annotation
-    // Signature: test/AnnoSetter|null[0]
-    annotation class AnnoSetter constructor() : Annotation
-    // Signature: test/AnnoSetter2|null[0]
-    annotation class AnnoSetter2 constructor() : Annotation
-    // Signature: test/B|null[0]
-    class B<@AnnoClassTypeParameter T> constructor()
-    // Signature: test/Foo|null[0]
-    @AnnoClass class Foo @AnnoConstructor constructor(@AnnoConstructorParameter i: Int) {
-        // Signature: test/Foo.immutableProp|{}immutableProp[0]
-        @delegate:AnnoDelegatedField val immutableProp: Int
-        // Signature: test/Foo.mutableProp|{}mutableProp[0]
-        var mutableProp: Int
-            // Signature: test/Foo.mutableProp.<set-mutableProp>|<set-mutableProp>(kotlin.Int){}[0]
-            @AnnoSetter2 set
-        // Signature: test/Foo.prop|{}prop[0]
-        @AnnoProperty @field:AnnoBackingField var prop: Int
-            // Signature: test/Foo.prop.<get-prop>|<get-prop>(){}[0]
-            @AnnoGetter get
-            // Signature: test/Foo.prop.<set-prop>|<set-prop>(kotlin.Int){}[0]
-            @AnnoSetter set
+library {
+  // module name: <annotations.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnoBackingField
+    // class name: test/AnnoClass
+    // class name: test/AnnoClassTypeParameter
+    // class name: test/AnnoClassUsageTypeParameter
+    // class name: test/AnnoConstructor
+    // class name: test/AnnoConstructorParameter
+    // class name: test/AnnoDelegatedField
+    // class name: test/AnnoFunction
+    // class name: test/AnnoFunctionExtensionReceiver
+    // class name: test/AnnoFunctionParam
+    // class name: test/AnnoFunctionTypeParameter
+    // class name: test/AnnoGetter
+    // class name: test/AnnoProperty
+    // class name: test/AnnoPropertyExtensionReceiver
+    // class name: test/AnnoSetParam
+    // class name: test/AnnoSetParam2
+    // class name: test/AnnoSetter
+    // class name: test/AnnoSetter2
+    // class name: test/B
+    // class name: test/Foo
+
+    // signature: test/AnnoBackingField|null[0]
+    public final annotation class test/AnnoBackingField : kotlin/Annotation {
+
+      // signature: test/AnnoBackingField.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: test/extProp|@test.Foo{}extProp[0]
-    @AnnoPropertyExtensionReceiver val Foo.extProp: Int
-    // Signature: test/extfun|extfun@test.Foo(kotlin.Int){}[0]
-    @AnnoFunction fun @receiver:AnnoFunctionExtensionReceiver Foo.extfun(@AnnoFunctionParam x: Int)
-    // Signature: test/f|f(test.B<kotlin.Int>){0§<kotlin.Any?>}[0]
-    fun <@AnnoFunctionTypeParameter T> f(x: B<@AnnoClassUsageTypeParameter Int>)
+
+    // signature: test/AnnoClass|null[0]
+    public final annotation class test/AnnoClass : kotlin/Annotation {
+
+      // signature: test/AnnoClass.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoClassTypeParameter|null[0]
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/AnnoClassTypeParameter : kotlin/Annotation {
+
+      // signature: test/AnnoClassTypeParameter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoClassUsageTypeParameter|null[0]
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE])
+    public final annotation class test/AnnoClassUsageTypeParameter : kotlin/Annotation {
+
+      // signature: test/AnnoClassUsageTypeParameter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructor|null[0]
+    public final annotation class test/AnnoConstructor : kotlin/Annotation {
+
+      // signature: test/AnnoConstructor.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructorParameter|null[0]
+    public final annotation class test/AnnoConstructorParameter : kotlin/Annotation {
+
+      // signature: test/AnnoConstructorParameter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoDelegatedField|null[0]
+    public final annotation class test/AnnoDelegatedField : kotlin/Annotation {
+
+      // signature: test/AnnoDelegatedField.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunction|null[0]
+    public final annotation class test/AnnoFunction : kotlin/Annotation {
+
+      // signature: test/AnnoFunction.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionExtensionReceiver|null[0]
+    public final annotation class test/AnnoFunctionExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionExtensionReceiver.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionParam|null[0]
+    public final annotation class test/AnnoFunctionParam : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionParam.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionTypeParameter|null[0]
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/AnnoFunctionTypeParameter : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionTypeParameter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoGetter|null[0]
+    public final annotation class test/AnnoGetter : kotlin/Annotation {
+
+      // signature: test/AnnoGetter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoProperty|null[0]
+    public final annotation class test/AnnoProperty : kotlin/Annotation {
+
+      // signature: test/AnnoProperty.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoPropertyExtensionReceiver|null[0]
+    public final annotation class test/AnnoPropertyExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoPropertyExtensionReceiver.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam|null[0]
+    public final annotation class test/AnnoSetParam : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam2|null[0]
+    public final annotation class test/AnnoSetParam2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter|null[0]
+    public final annotation class test/AnnoSetter : kotlin/Annotation {
+
+      // signature: test/AnnoSetter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter2|null[0]
+    public final annotation class test/AnnoSetter2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetter2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/B|null[0]
+    public final class test/B<@test/AnnoClassTypeParameter T#0 /* T */> : kotlin/Any {
+
+      // signature: test/B.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/Foo|null[0]
+    @test/AnnoClass
+    public final class test/Foo : kotlin/Any {
+
+      // signature: test/Foo.<init>|<init>(kotlin.Int){}[0]
+      @test/AnnoConstructor
+      public constructor(@test/AnnoConstructorParameter i: kotlin/Int)
+
+      // signature: test/Foo.immutableProp|{}immutableProp[0]
+      public final /* delegated */ val immutableProp: kotlin/Int
+        // signature: test/Foo.immutableProp.<get-immutableProp>|<get-immutableProp>(){}[0]
+        public final /* non-default */ get
+
+      // signature: test/Foo.mutableProp|{}mutableProp[0]
+      public final var mutableProp: kotlin/Int
+        // signature: test/Foo.mutableProp.<get-mutableProp>|<get-mutableProp>(){}[0]
+        public final get
+        // signature: test/Foo.mutableProp.<set-mutableProp>|<set-mutableProp>(kotlin.Int){}[0]
+        @test/AnnoSetter2
+        public final /* non-default */ set(@test/AnnoSetParam2 x: kotlin/Int)
+
+      // signature: test/Foo.prop|{}prop[0]
+      @test/AnnoProperty
+      public final var prop: kotlin/Int
+        // signature: test/Foo.prop.<get-prop>|<get-prop>(){}[0]
+        @test/AnnoGetter
+        public final /* non-default */ get
+        // signature: test/Foo.prop.<set-prop>|<set-prop>(kotlin.Int){}[0]
+        @test/AnnoSetter
+        public final /* non-default */ set(@test/AnnoSetParam x: kotlin/Int)
+    }
+
+    package {
+
+      // signature: test/extfun|extfun@test.Foo(kotlin.Int){}[0]
+      @test/AnnoFunction
+      public final fun test/Foo.extfun(@test/AnnoFunctionParam x: kotlin/Int): kotlin/Unit
+
+      // signature: test/f|f(test.B<kotlin.Int>){0§<kotlin.Any?>}[0]
+      public final fun <@test/AnnoFunctionTypeParameter T#0 /* T */> f(x: test/B<@test/AnnoClassUsageTypeParameter kotlin/Int>): kotlin/Unit
+
+      // signature: test/extProp|@test.Foo{}extProp[0]
+      @test/AnnoPropertyExtensionReceiver
+      public final val test/Foo.extProp: kotlin/Int
+        // signature: test/extProp.<get-extProp>|<get-extProp>@test.Foo(){}[0]
+        public final /* non-default */ get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/annotations_source_retention.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 @Retention(AnnotationRetention.SOURCE)
 annotation class AnnoClass

native/native.tests/testData/klib/dump-metadata/annotations_source_retention.txt

@@ -1,24 +1,138 @@
-package test {
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoBackingField constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoClass constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoConstructor constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoConstructorParameter constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoDelegatedField constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunction constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunctionExtensionReceiver constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunctionParam constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoGetter constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoProperty constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoPropertyExtensionReceiver constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetParam constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetParam2 constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetter constructor() : Annotation
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetter2 constructor() : Annotation
-    class Foo constructor(i: Int) {
-        val immutableProp: Int
-        var mutableProp: Int
-        var prop: Int
+library {
+  // module name: <annotations_source_retention.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnoBackingField
+    // class name: test/AnnoClass
+    // class name: test/AnnoConstructor
+    // class name: test/AnnoConstructorParameter
+    // class name: test/AnnoDelegatedField
+    // class name: test/AnnoFunction
+    // class name: test/AnnoFunctionExtensionReceiver
+    // class name: test/AnnoFunctionParam
+    // class name: test/AnnoGetter
+    // class name: test/AnnoProperty
+    // class name: test/AnnoPropertyExtensionReceiver
+    // class name: test/AnnoSetParam
+    // class name: test/AnnoSetParam2
+    // class name: test/AnnoSetter
+    // class name: test/AnnoSetter2
+    // class name: test/Foo
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoBackingField : kotlin/Annotation {
+
+      public constructor()
     }
-    val Foo.extProp: Int
-    fun Foo.extfun(x: Int)
-}
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoClass : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoConstructor : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoConstructorParameter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoDelegatedField : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunction : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunctionExtensionReceiver : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunctionParam : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoGetter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoProperty : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoPropertyExtensionReceiver : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetParam : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetParam2 : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetter : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetter2 : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final class test/Foo : kotlin/Any {
+
+      public constructor(i: kotlin/Int)
+
+      public final /* delegated */ val immutableProp: kotlin/Int
+        public final /* non-default */ get
+
+      public final var mutableProp: kotlin/Int
+        public final get
+        public final /* non-default */ set(x: kotlin/Int)
+
+      public final var prop: kotlin/Int
+        public final /* non-default */ get
+        public final /* non-default */ set(x: kotlin/Int)
+    }
+
+    package {
+
+      public final fun test/Foo.extfun(x: kotlin/Int): kotlin/Unit
+
+      public final val test/Foo.extProp: kotlin/Int
+        public final /* non-default */ get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/annotations_source_retention.v1.txt

@@ -1,45 +1,181 @@
-package test {
-    // Signature: test/AnnoBackingField|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoBackingField constructor() : Annotation
-    // Signature: test/AnnoClass|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoClass constructor() : Annotation
-    // Signature: test/AnnoConstructor|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoConstructor constructor() : Annotation
-    // Signature: test/AnnoConstructorParameter|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoConstructorParameter constructor() : Annotation
-    // Signature: test/AnnoDelegatedField|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoDelegatedField constructor() : Annotation
-    // Signature: test/AnnoFunction|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunction constructor() : Annotation
-    // Signature: test/AnnoFunctionExtensionReceiver|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunctionExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoFunctionParam|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunctionParam constructor() : Annotation
-    // Signature: test/AnnoGetter|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoGetter constructor() : Annotation
-    // Signature: test/AnnoProperty|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoProperty constructor() : Annotation
-    // Signature: test/AnnoPropertyExtensionReceiver|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoPropertyExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoSetParam|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetParam constructor() : Annotation
-    // Signature: test/AnnoSetParam2|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetParam2 constructor() : Annotation
-    // Signature: test/AnnoSetter|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetter constructor() : Annotation
-    // Signature: test/AnnoSetter2|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetter2 constructor() : Annotation
-    // Signature: test/Foo|null[0]
-    class Foo constructor(i: Int) {
-        // Signature: test/Foo.immutableProp|-821319779095389209[0]
-        val immutableProp: Int
-        // Signature: test/Foo.mutableProp|1472686943295008822[0]
-        var mutableProp: Int
-        // Signature: test/Foo.prop|3598315380056892812[0]
-        var prop: Int
+library {
+  // module name: <annotations_source_retention.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnoBackingField
+    // class name: test/AnnoClass
+    // class name: test/AnnoConstructor
+    // class name: test/AnnoConstructorParameter
+    // class name: test/AnnoDelegatedField
+    // class name: test/AnnoFunction
+    // class name: test/AnnoFunctionExtensionReceiver
+    // class name: test/AnnoFunctionParam
+    // class name: test/AnnoGetter
+    // class name: test/AnnoProperty
+    // class name: test/AnnoPropertyExtensionReceiver
+    // class name: test/AnnoSetParam
+    // class name: test/AnnoSetParam2
+    // class name: test/AnnoSetter
+    // class name: test/AnnoSetter2
+    // class name: test/Foo
+
+    // signature: test/AnnoBackingField|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoBackingField : kotlin/Annotation {
+
+      // signature: test/AnnoBackingField.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: test/extProp|-6867325556440293248[0]
-    val Foo.extProp: Int
-    // Signature: test/extfun|-4862331552047794615[0]
-    fun Foo.extfun(x: Int)
+
+    // signature: test/AnnoClass|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoClass : kotlin/Annotation {
+
+      // signature: test/AnnoClass.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructor|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoConstructor : kotlin/Annotation {
+
+      // signature: test/AnnoConstructor.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructorParameter|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoConstructorParameter : kotlin/Annotation {
+
+      // signature: test/AnnoConstructorParameter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoDelegatedField|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoDelegatedField : kotlin/Annotation {
+
+      // signature: test/AnnoDelegatedField.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunction|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunction : kotlin/Annotation {
+
+      // signature: test/AnnoFunction.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionExtensionReceiver|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunctionExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionExtensionReceiver.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionParam|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunctionParam : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionParam.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoGetter|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoGetter : kotlin/Annotation {
+
+      // signature: test/AnnoGetter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoProperty|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoProperty : kotlin/Annotation {
+
+      // signature: test/AnnoProperty.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoPropertyExtensionReceiver|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoPropertyExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoPropertyExtensionReceiver.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetParam : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam2|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetParam2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetter : kotlin/Annotation {
+
+      // signature: test/AnnoSetter.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter2|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetter2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetter2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/Foo|null[0]
+    public final class test/Foo : kotlin/Any {
+
+      // signature: test/Foo.<init>|-5182794243525578284[0]
+      public constructor(i: kotlin/Int)
+
+      // signature: test/Foo.immutableProp|-821319779095389209[0]
+      public final /* delegated */ val immutableProp: kotlin/Int
+        // signature: test/Foo.immutableProp.<get-immutableProp>|325589445193220939[0]
+        public final /* non-default */ get
+
+      // signature: test/Foo.mutableProp|1472686943295008822[0]
+      public final var mutableProp: kotlin/Int
+        // signature: test/Foo.mutableProp.<get-mutableProp>|-557070840259409057[0]
+        public final get
+        // signature: test/Foo.mutableProp.<set-mutableProp>|-3965758569411010277[0]
+        public final /* non-default */ set(x: kotlin/Int)
+
+      // signature: test/Foo.prop|3598315380056892812[0]
+      public final var prop: kotlin/Int
+        // signature: test/Foo.prop.<get-prop>|-5734736374948136327[0]
+        public final /* non-default */ get
+        // signature: test/Foo.prop.<set-prop>|3724820243841906450[0]
+        public final /* non-default */ set(x: kotlin/Int)
+    }
+
+    package {
+
+      // signature: test/extfun|-4862331552047794615[0]
+      public final fun test/Foo.extfun(x: kotlin/Int): kotlin/Unit
+
+      // signature: test/extProp|-6867325556440293248[0]
+      public final val test/Foo.extProp: kotlin/Int
+        // signature: test/extProp.<get-extProp>|8446410089263600861[0]
+        public final /* non-default */ get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/annotations_source_retention.v2.txt

@@ -1,45 +1,181 @@
-package test {
-    // Signature: test/AnnoBackingField|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoBackingField constructor() : Annotation
-    // Signature: test/AnnoClass|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoClass constructor() : Annotation
-    // Signature: test/AnnoConstructor|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoConstructor constructor() : Annotation
-    // Signature: test/AnnoConstructorParameter|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoConstructorParameter constructor() : Annotation
-    // Signature: test/AnnoDelegatedField|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoDelegatedField constructor() : Annotation
-    // Signature: test/AnnoFunction|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunction constructor() : Annotation
-    // Signature: test/AnnoFunctionExtensionReceiver|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunctionExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoFunctionParam|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoFunctionParam constructor() : Annotation
-    // Signature: test/AnnoGetter|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoGetter constructor() : Annotation
-    // Signature: test/AnnoProperty|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoProperty constructor() : Annotation
-    // Signature: test/AnnoPropertyExtensionReceiver|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoPropertyExtensionReceiver constructor() : Annotation
-    // Signature: test/AnnoSetParam|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetParam constructor() : Annotation
-    // Signature: test/AnnoSetParam2|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetParam2 constructor() : Annotation
-    // Signature: test/AnnoSetter|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetter constructor() : Annotation
-    // Signature: test/AnnoSetter2|null[0]
-    @Retention(value = AnnotationRetention.SOURCE) annotation class AnnoSetter2 constructor() : Annotation
-    // Signature: test/Foo|null[0]
-    class Foo constructor(i: Int) {
-        // Signature: test/Foo.immutableProp|{}immutableProp[0]
-        val immutableProp: Int
-        // Signature: test/Foo.mutableProp|{}mutableProp[0]
-        var mutableProp: Int
-        // Signature: test/Foo.prop|{}prop[0]
-        var prop: Int
+library {
+  // module name: <annotations_source_retention.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnoBackingField
+    // class name: test/AnnoClass
+    // class name: test/AnnoConstructor
+    // class name: test/AnnoConstructorParameter
+    // class name: test/AnnoDelegatedField
+    // class name: test/AnnoFunction
+    // class name: test/AnnoFunctionExtensionReceiver
+    // class name: test/AnnoFunctionParam
+    // class name: test/AnnoGetter
+    // class name: test/AnnoProperty
+    // class name: test/AnnoPropertyExtensionReceiver
+    // class name: test/AnnoSetParam
+    // class name: test/AnnoSetParam2
+    // class name: test/AnnoSetter
+    // class name: test/AnnoSetter2
+    // class name: test/Foo
+
+    // signature: test/AnnoBackingField|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoBackingField : kotlin/Annotation {
+
+      // signature: test/AnnoBackingField.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: test/extProp|@test.Foo{}extProp[0]
-    val Foo.extProp: Int
-    // Signature: test/extfun|extfun@test.Foo(kotlin.Int){}[0]
-    fun Foo.extfun(x: Int)
+
+    // signature: test/AnnoClass|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoClass : kotlin/Annotation {
+
+      // signature: test/AnnoClass.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructor|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoConstructor : kotlin/Annotation {
+
+      // signature: test/AnnoConstructor.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoConstructorParameter|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoConstructorParameter : kotlin/Annotation {
+
+      // signature: test/AnnoConstructorParameter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoDelegatedField|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoDelegatedField : kotlin/Annotation {
+
+      // signature: test/AnnoDelegatedField.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunction|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunction : kotlin/Annotation {
+
+      // signature: test/AnnoFunction.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionExtensionReceiver|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunctionExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionExtensionReceiver.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoFunctionParam|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoFunctionParam : kotlin/Annotation {
+
+      // signature: test/AnnoFunctionParam.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoGetter|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoGetter : kotlin/Annotation {
+
+      // signature: test/AnnoGetter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoProperty|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoProperty : kotlin/Annotation {
+
+      // signature: test/AnnoProperty.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoPropertyExtensionReceiver|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoPropertyExtensionReceiver : kotlin/Annotation {
+
+      // signature: test/AnnoPropertyExtensionReceiver.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetParam : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetParam2|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetParam2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetParam2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetter : kotlin/Annotation {
+
+      // signature: test/AnnoSetter.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/AnnoSetter2|null[0]
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.SOURCE)
+    public final annotation class test/AnnoSetter2 : kotlin/Annotation {
+
+      // signature: test/AnnoSetter2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/Foo|null[0]
+    public final class test/Foo : kotlin/Any {
+
+      // signature: test/Foo.<init>|<init>(kotlin.Int){}[0]
+      public constructor(i: kotlin/Int)
+
+      // signature: test/Foo.immutableProp|{}immutableProp[0]
+      public final /* delegated */ val immutableProp: kotlin/Int
+        // signature: test/Foo.immutableProp.<get-immutableProp>|<get-immutableProp>(){}[0]
+        public final /* non-default */ get
+
+      // signature: test/Foo.mutableProp|{}mutableProp[0]
+      public final var mutableProp: kotlin/Int
+        // signature: test/Foo.mutableProp.<get-mutableProp>|<get-mutableProp>(){}[0]
+        public final get
+        // signature: test/Foo.mutableProp.<set-mutableProp>|<set-mutableProp>(kotlin.Int){}[0]
+        public final /* non-default */ set(x: kotlin/Int)
+
+      // signature: test/Foo.prop|{}prop[0]
+      public final var prop: kotlin/Int
+        // signature: test/Foo.prop.<get-prop>|<get-prop>(){}[0]
+        public final /* non-default */ get
+        // signature: test/Foo.prop.<set-prop>|<set-prop>(kotlin.Int){}[0]
+        public final /* non-default */ set(x: kotlin/Int)
+    }
+
+    package {
+
+      // signature: test/extfun|extfun@test.Foo(kotlin.Int){}[0]
+      public final fun test/Foo.extfun(x: kotlin/Int): kotlin/Unit
+
+      // signature: test/extProp|@test.Foo{}extProp[0]
+      public final val test/Foo.extProp: kotlin/Int
+        // signature: test/extProp.<get-extProp>|<get-extProp>@test.Foo(){}[0]
+        public final /* non-default */ get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.fir.txt

@@ -0,0 +1,46 @@
+library {
+  // module name: <annotatedEnumEntry.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/Anno
+    // class name: test/Bnno
+    // class name: test/Eee
+
+    public final annotation class test/Anno : kotlin/Annotation {
+
+      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+
+      public final val value: kotlin/String
+        public final get
+
+      public final val x: kotlin/Int
+        public final get
+    }
+
+    public final annotation class test/Bnno : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final enum class test/Eee : kotlin/Enum<test/Eee> {
+
+      private constructor()
+
+      @test/Anno
+      Entry1,
+
+      Entry2,
+
+      @test/Anno(value = "3")
+      @test/Bnno
+      Entry3,
+
+      @test/Anno(value = "4", x = 4)
+      Entry4,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.txt

@@ -1,13 +1,66 @@
-package test {
-    annotation class Anno constructor(value: String = ..., x: Int = ...) : Annotation {
-        val value: String
-        val x: Int
+library {
+  // module name: <annotatedEnumEntry.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/Anno
+    // class name: test/Bnno
+    // class name: test/Eee
+    // class name: test/Eee.Entry1
+    // class name: test/Eee.Entry2
+    // class name: test/Eee.Entry3
+    // class name: test/Eee.Entry4
+
+    public final annotation class test/Anno : kotlin/Annotation {
+
+      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+
+      public final val value: kotlin/String
+        public final get
+
+      public final val x: kotlin/Int
+        public final get
     }
-    annotation class Bnno constructor() : Annotation
-    enum class Eee private constructor() : Enum<Eee> {
-        @Anno enum entry Entry1
-        enum entry Entry2
-        @Anno(value = "3") @Bnno enum entry Entry3
-        @Anno(value = "4", x = 4) enum entry Entry4
+
+    public final annotation class test/Bnno : kotlin/Annotation {
+
+      public constructor()
     }
-}
+
+    public final enum class test/Eee : kotlin/Enum<test/Eee> {
+
+      private constructor()
+
+      @test/Anno
+      Entry1,
+
+      Entry2,
+
+      @test/Anno(value = "3")
+      @test/Bnno
+      Entry3,
+
+      @test/Anno(value = "4", x = 4)
+      Entry4,
+
+      // has Enum.entries
+    }
+
+    @test/Anno
+    public final enum entry test/Eee.Entry1 : test/Eee {
+    }
+
+    public final enum entry test/Eee.Entry2 : test/Eee {
+    }
+
+    @test/Anno(value = "3")
+    @test/Bnno
+    public final enum entry test/Eee.Entry3 : test/Eee {
+    }
+
+    @test/Anno(value = "4", x = 4)
+    public final enum entry test/Eee.Entry4 : test/Eee {
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.v1.fir.txt

@@ -0,0 +1,60 @@
+library {
+  // module name: <annotatedEnumEntry.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/Anno
+    // class name: test/Bnno
+    // class name: test/Eee
+
+    // signature: test/Anno|null[0]
+    public final annotation class test/Anno : kotlin/Annotation {
+
+      // signature: test/Anno.<init>|-2457917570611619111[0]
+      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+
+      // signature: test/Anno.value|1987073854177347439[0]
+      public final val value: kotlin/String
+        // signature: test/Anno.value.<get-value>|3260093555963109437[0]
+        public final get
+
+      // signature: test/Anno.x|-8060530855978347579[0]
+      public final val x: kotlin/Int
+        // signature: test/Anno.x.<get-x>|1482705010654679335[0]
+        public final get
+    }
+
+    // signature: test/Bnno|null[0]
+    public final annotation class test/Bnno : kotlin/Annotation {
+
+      // signature: test/Bnno.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/Eee|null[0]
+    public final enum class test/Eee : kotlin/Enum<test/Eee> {
+
+      // signature: test/Eee.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: test/Eee.Entry1|null[0]
+      @test/Anno
+      Entry1,
+
+      // signature: test/Eee.Entry2|null[0]
+      Entry2,
+
+      // signature: test/Eee.Entry3|null[0]
+      @test/Anno(value = "3")
+      @test/Bnno
+      Entry3,
+
+      // signature: test/Eee.Entry4|null[0]
+      @test/Anno(value = "4", x = 4)
+      Entry4,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.v1.txt

@@ -1,22 +1,84 @@
-package test {
-    // Signature: test/Anno|null[0]
-    annotation class Anno constructor(value: String = ..., x: Int = ...) : Annotation {
-        // Signature: test/Anno.value|1987073854177347439[0]
-        val value: String
-        // Signature: test/Anno.x|-8060530855978347579[0]
-        val x: Int
+library {
+  // module name: <annotatedEnumEntry.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/Anno
+    // class name: test/Bnno
+    // class name: test/Eee
+    // class name: test/Eee.Entry1
+    // class name: test/Eee.Entry2
+    // class name: test/Eee.Entry3
+    // class name: test/Eee.Entry4
+
+    // signature: test/Anno|null[0]
+    public final annotation class test/Anno : kotlin/Annotation {
+
+      // signature: test/Anno.<init>|-2457917570611619111[0]
+      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+
+      // signature: test/Anno.value|1987073854177347439[0]
+      public final val value: kotlin/String
+        // signature: test/Anno.value.<get-value>|3260093555963109437[0]
+        public final get
+
+      // signature: test/Anno.x|-8060530855978347579[0]
+      public final val x: kotlin/Int
+        // signature: test/Anno.x.<get-x>|1482705010654679335[0]
+        public final get
     }
-    // Signature: test/Bnno|null[0]
-    annotation class Bnno constructor() : Annotation
-    // Signature: test/Eee|null[0]
-    enum class Eee private constructor() : Enum<Eee> {
-        // Signature: test/Eee.Entry1|null[0]
-        @Anno enum entry Entry1
-        // Signature: test/Eee.Entry2|null[0]
-        enum entry Entry2
-        // Signature: test/Eee.Entry3|null[0]
-        @Anno(value = "3") @Bnno enum entry Entry3
-        // Signature: test/Eee.Entry4|null[0]
-        @Anno(value = "4", x = 4) enum entry Entry4
+
+    // signature: test/Bnno|null[0]
+    public final annotation class test/Bnno : kotlin/Annotation {
+
+      // signature: test/Bnno.<init>|-5645683436151566731[0]
+      public constructor()
     }
+
+    // signature: test/Eee|null[0]
+    public final enum class test/Eee : kotlin/Enum<test/Eee> {
+
+      // signature: test/Eee.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: test/Eee.Entry1|null[0]
+      @test/Anno
+      Entry1,
+
+      // signature: test/Eee.Entry2|null[0]
+      Entry2,
+
+      // signature: test/Eee.Entry3|null[0]
+      @test/Anno(value = "3")
+      @test/Bnno
+      Entry3,
+
+      // signature: test/Eee.Entry4|null[0]
+      @test/Anno(value = "4", x = 4)
+      Entry4,
+
+      // has Enum.entries
+    }
+
+    // signature: test/Eee.Entry1|null[0]
+    @test/Anno
+    public final enum entry test/Eee.Entry1 : test/Eee {
+    }
+
+    // signature: test/Eee.Entry2|null[0]
+    public final enum entry test/Eee.Entry2 : test/Eee {
+    }
+
+    // signature: test/Eee.Entry3|null[0]
+    @test/Anno(value = "3")
+    @test/Bnno
+    public final enum entry test/Eee.Entry3 : test/Eee {
+    }
+
+    // signature: test/Eee.Entry4|null[0]
+    @test/Anno(value = "4", x = 4)
+    public final enum entry test/Eee.Entry4 : test/Eee {
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.v2.fir.txt

@@ -0,0 +1,60 @@
+library {
+  // module name: <annotatedEnumEntry.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/Anno
+    // class name: test/Bnno
+    // class name: test/Eee
+
+    // signature: test/Anno|null[0]
+    public final annotation class test/Anno : kotlin/Annotation {
+
+      // signature: test/Anno.<init>|<init>(kotlin.String;kotlin.Int){}[0]
+      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+
+      // signature: test/Anno.value|{}value[0]
+      public final val value: kotlin/String
+        // signature: test/Anno.value.<get-value>|<get-value>(){}[0]
+        public final get
+
+      // signature: test/Anno.x|{}x[0]
+      public final val x: kotlin/Int
+        // signature: test/Anno.x.<get-x>|<get-x>(){}[0]
+        public final get
+    }
+
+    // signature: test/Bnno|null[0]
+    public final annotation class test/Bnno : kotlin/Annotation {
+
+      // signature: test/Bnno.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/Eee|null[0]
+    public final enum class test/Eee : kotlin/Enum<test/Eee> {
+
+      // signature: test/Eee.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: test/Eee.Entry1|null[0]
+      @test/Anno
+      Entry1,
+
+      // signature: test/Eee.Entry2|null[0]
+      Entry2,
+
+      // signature: test/Eee.Entry3|null[0]
+      @test/Anno(value = "3")
+      @test/Bnno
+      Entry3,
+
+      // signature: test/Eee.Entry4|null[0]
+      @test/Anno(value = "4", x = 4)
+      Entry4,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotatedEnumEntry.v2.txt

@@ -1,22 +1,84 @@
-package test {
-    // Signature: test/Anno|null[0]
-    annotation class Anno constructor(value: String = ..., x: Int = ...) : Annotation {
-        // Signature: test/Anno.value|{}value[0]
-        val value: String
-        // Signature: test/Anno.x|{}x[0]
-        val x: Int
+library {
+  // module name: <annotatedEnumEntry.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/Anno
+    // class name: test/Bnno
+    // class name: test/Eee
+    // class name: test/Eee.Entry1
+    // class name: test/Eee.Entry2
+    // class name: test/Eee.Entry3
+    // class name: test/Eee.Entry4
+
+    // signature: test/Anno|null[0]
+    public final annotation class test/Anno : kotlin/Annotation {
+
+      // signature: test/Anno.<init>|<init>(kotlin.String;kotlin.Int){}[0]
+      public constructor(value: kotlin/String /* = ... */, x: kotlin/Int /* = ... */)
+
+      // signature: test/Anno.value|{}value[0]
+      public final val value: kotlin/String
+        // signature: test/Anno.value.<get-value>|<get-value>(){}[0]
+        public final get
+
+      // signature: test/Anno.x|{}x[0]
+      public final val x: kotlin/Int
+        // signature: test/Anno.x.<get-x>|<get-x>(){}[0]
+        public final get
     }
-    // Signature: test/Bnno|null[0]
-    annotation class Bnno constructor() : Annotation
-    // Signature: test/Eee|null[0]
-    enum class Eee private constructor() : Enum<Eee> {
-        // Signature: test/Eee.Entry1|null[0]
-        @Anno enum entry Entry1
-        // Signature: test/Eee.Entry2|null[0]
-        enum entry Entry2
-        // Signature: test/Eee.Entry3|null[0]
-        @Anno(value = "3") @Bnno enum entry Entry3
-        // Signature: test/Eee.Entry4|null[0]
-        @Anno(value = "4", x = 4) enum entry Entry4
+
+    // signature: test/Bnno|null[0]
+    public final annotation class test/Bnno : kotlin/Annotation {
+
+      // signature: test/Bnno.<init>|<init>(){}[0]
+      public constructor()
     }
+
+    // signature: test/Eee|null[0]
+    public final enum class test/Eee : kotlin/Enum<test/Eee> {
+
+      // signature: test/Eee.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: test/Eee.Entry1|null[0]
+      @test/Anno
+      Entry1,
+
+      // signature: test/Eee.Entry2|null[0]
+      Entry2,
+
+      // signature: test/Eee.Entry3|null[0]
+      @test/Anno(value = "3")
+      @test/Bnno
+      Entry3,
+
+      // signature: test/Eee.Entry4|null[0]
+      @test/Anno(value = "4", x = 4)
+      Entry4,
+
+      // has Enum.entries
+    }
+
+    // signature: test/Eee.Entry1|null[0]
+    @test/Anno
+    public final enum entry test/Eee.Entry1 : test/Eee {
+    }
+
+    // signature: test/Eee.Entry2|null[0]
+    public final enum entry test/Eee.Entry2 : test/Eee {
+    }
+
+    // signature: test/Eee.Entry3|null[0]
+    @test/Anno(value = "3")
+    @test/Bnno
+    public final enum entry test/Eee.Entry3 : test/Eee {
+    }
+
+    // signature: test/Eee.Entry4|null[0]
+    @test/Anno(value = "4", x = 4)
+    public final enum entry test/Eee.Entry4 : test/Eee {
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 
 annotation class Empty

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.txt

@@ -1,11 +1,47 @@
-package test {
-    annotation class AnnotationArray constructor(annotationArray: Array<JustAnnotation>) : Annotation {
-        val annotationArray: Array<JustAnnotation>
+library {
+  // module name: <annotation.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnotationArray
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/Empty
+    // class name: test/JustAnnotation
+
+    public final annotation class test/AnnotationArray : kotlin/Annotation {
+
+      public constructor(annotationArray: kotlin/Array<test/JustAnnotation>)
+
+      public final val annotationArray: kotlin/Array<test/JustAnnotation>
+        public final get
     }
-    @JustAnnotation(annotation = Empty) @AnnotationArray(annotationArray = {}) class C1 constructor()
-    @AnnotationArray(annotationArray = {JustAnnotation(annotation = Empty), JustAnnotation(annotation = Empty)}) class C2 constructor()
-    annotation class Empty constructor() : Annotation
-    annotation class JustAnnotation constructor(annotation: Empty) : Annotation {
-        val annotation: Empty
+
+    @test/JustAnnotation(annotation = test/Empty())
+    @test/AnnotationArray(annotationArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      public constructor()
     }
+
+    @test/AnnotationArray(annotationArray = [test/JustAnnotation(annotation = test/Empty()), test/JustAnnotation(annotation = test/Empty())])
+    public final class test/C2 : kotlin/Any {
+
+      public constructor()
+    }
+
+    public final annotation class test/Empty : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final annotation class test/JustAnnotation : kotlin/Annotation {
+
+      public constructor(annotation: test/Empty)
+
+      public final val annotation: test/Empty
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.v1.txt

@@ -1,18 +1,61 @@
-package test {
-    // Signature: test/AnnotationArray|null[0]
-    annotation class AnnotationArray constructor(annotationArray: Array<JustAnnotation>) : Annotation {
-        // Signature: test/AnnotationArray.annotationArray|8313552415425816993[0]
-        val annotationArray: Array<JustAnnotation>
+library {
+  // module name: <annotation.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnotationArray
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/Empty
+    // class name: test/JustAnnotation
+
+    // signature: test/AnnotationArray|null[0]
+    public final annotation class test/AnnotationArray : kotlin/Annotation {
+
+      // signature: test/AnnotationArray.<init>|-6014246659175253914[0]
+      public constructor(annotationArray: kotlin/Array<test/JustAnnotation>)
+
+      // signature: test/AnnotationArray.annotationArray|8313552415425816993[0]
+      public final val annotationArray: kotlin/Array<test/JustAnnotation>
+        // signature: test/AnnotationArray.annotationArray.<get-annotationArray>|9152756390547890002[0]
+        public final get
     }
-    // Signature: test/C1|null[0]
-    @JustAnnotation(annotation = Empty) @AnnotationArray(annotationArray = {}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @AnnotationArray(annotationArray = {JustAnnotation(annotation = Empty), JustAnnotation(annotation = Empty)}) class C2 constructor()
-    // Signature: test/Empty|null[0]
-    annotation class Empty constructor() : Annotation
-    // Signature: test/JustAnnotation|null[0]
-    annotation class JustAnnotation constructor(annotation: Empty) : Annotation {
-        // Signature: test/JustAnnotation.annotation|-5849805091355678126[0]
-        val annotation: Empty
+
+    // signature: test/C1|null[0]
+    @test/JustAnnotation(annotation = test/Empty())
+    @test/AnnotationArray(annotationArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|-5645683436151566731[0]
+      public constructor()
     }
+
+    // signature: test/C2|null[0]
+    @test/AnnotationArray(annotationArray = [test/JustAnnotation(annotation = test/Empty()), test/JustAnnotation(annotation = test/Empty())])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/Empty|null[0]
+    public final annotation class test/Empty : kotlin/Annotation {
+
+      // signature: test/Empty.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/JustAnnotation|null[0]
+    public final annotation class test/JustAnnotation : kotlin/Annotation {
+
+      // signature: test/JustAnnotation.<init>|5792502191508234832[0]
+      public constructor(annotation: test/Empty)
+
+      // signature: test/JustAnnotation.annotation|-5849805091355678126[0]
+      public final val annotation: test/Empty
+        // signature: test/JustAnnotation.annotation.<get-annotation>|6966823876819433685[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/annotation.v2.txt

@@ -1,18 +1,61 @@
-package test {
-    // Signature: test/AnnotationArray|null[0]
-    annotation class AnnotationArray constructor(annotationArray: Array<JustAnnotation>) : Annotation {
-        // Signature: test/AnnotationArray.annotationArray|{}annotationArray[0]
-        val annotationArray: Array<JustAnnotation>
+library {
+  // module name: <annotation.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/AnnotationArray
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/Empty
+    // class name: test/JustAnnotation
+
+    // signature: test/AnnotationArray|null[0]
+    public final annotation class test/AnnotationArray : kotlin/Annotation {
+
+      // signature: test/AnnotationArray.<init>|<init>(kotlin.Array<test.JustAnnotation>){}[0]
+      public constructor(annotationArray: kotlin/Array<test/JustAnnotation>)
+
+      // signature: test/AnnotationArray.annotationArray|{}annotationArray[0]
+      public final val annotationArray: kotlin/Array<test/JustAnnotation>
+        // signature: test/AnnotationArray.annotationArray.<get-annotationArray>|<get-annotationArray>(){}[0]
+        public final get
     }
-    // Signature: test/C1|null[0]
-    @JustAnnotation(annotation = Empty) @AnnotationArray(annotationArray = {}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @AnnotationArray(annotationArray = {JustAnnotation(annotation = Empty), JustAnnotation(annotation = Empty)}) class C2 constructor()
-    // Signature: test/Empty|null[0]
-    annotation class Empty constructor() : Annotation
-    // Signature: test/JustAnnotation|null[0]
-    annotation class JustAnnotation constructor(annotation: Empty) : Annotation {
-        // Signature: test/JustAnnotation.annotation|{}annotation[0]
-        val annotation: Empty
+
+    // signature: test/C1|null[0]
+    @test/JustAnnotation(annotation = test/Empty())
+    @test/AnnotationArray(annotationArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|<init>(){}[0]
+      public constructor()
     }
+
+    // signature: test/C2|null[0]
+    @test/AnnotationArray(annotationArray = [test/JustAnnotation(annotation = test/Empty()), test/JustAnnotation(annotation = test/Empty())])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/Empty|null[0]
+    public final annotation class test/Empty : kotlin/Annotation {
+
+      // signature: test/Empty.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/JustAnnotation|null[0]
+    public final annotation class test/JustAnnotation : kotlin/Annotation {
+
+      // signature: test/JustAnnotation.<init>|<init>(test.Empty){}[0]
+      public constructor(annotation: test/Empty)
+
+      // signature: test/JustAnnotation.annotation|{}annotation[0]
+      public final val annotation: test/Empty
+        // signature: test/JustAnnotation.annotation.<get-annotation>|<get-annotation>(){}[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.fir.txt

@@ -0,0 +1,55 @@
+library {
+  // module name: <enum.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/EnumArray
+    // class name: test/JustEnum
+    // class name: test/Weapon
+
+    @test/JustEnum(weapon = test/Weapon.SCISSORS)
+    @test/EnumArray(enumArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      public constructor()
+    }
+
+    @test/EnumArray(enumArray = [test/Weapon.PAPER, test/Weapon.ROCK])
+    public final class test/C2 : kotlin/Any {
+
+      public constructor()
+    }
+
+    public final annotation class test/EnumArray : kotlin/Annotation {
+
+      public constructor(enumArray: kotlin/Array<test/Weapon>)
+
+      public final val enumArray: kotlin/Array<test/Weapon>
+        public final get
+    }
+
+    public final annotation class test/JustEnum : kotlin/Annotation {
+
+      public constructor(weapon: test/Weapon)
+
+      public final val weapon: test/Weapon
+        public final get
+    }
+
+    public final enum class test/Weapon : kotlin/Enum<test/Weapon> {
+
+      private constructor()
+
+      ROCK,
+
+      PAPER,
+
+      SCISSORS,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.txt

@@ -1,15 +1,67 @@
-package test {
-    @JustEnum(weapon = Weapon.SCISSORS) @EnumArray(enumArray = {}) class C1 constructor()
-    @EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) class C2 constructor()
-    annotation class EnumArray constructor(enumArray: Array<Weapon>) : Annotation {
-        val enumArray: Array<Weapon>
+library {
+  // module name: <enum.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/EnumArray
+    // class name: test/JustEnum
+    // class name: test/Weapon
+    // class name: test/Weapon.PAPER
+    // class name: test/Weapon.ROCK
+    // class name: test/Weapon.SCISSORS
+
+    @test/JustEnum(weapon = test/Weapon.SCISSORS)
+    @test/EnumArray(enumArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      public constructor()
     }
-    annotation class JustEnum constructor(weapon: Weapon) : Annotation {
-        val weapon: Weapon
+
+    @test/EnumArray(enumArray = [test/Weapon.PAPER, test/Weapon.ROCK])
+    public final class test/C2 : kotlin/Any {
+
+      public constructor()
     }
-    enum class Weapon private constructor() : Enum<Weapon> {
-        enum entry ROCK
-        enum entry PAPER
-        enum entry SCISSORS
+
+    public final annotation class test/EnumArray : kotlin/Annotation {
+
+      public constructor(enumArray: kotlin/Array<test/Weapon>)
+
+      public final val enumArray: kotlin/Array<test/Weapon>
+        public final get
     }
+
+    public final annotation class test/JustEnum : kotlin/Annotation {
+
+      public constructor(weapon: test/Weapon)
+
+      public final val weapon: test/Weapon
+        public final get
+    }
+
+    public final enum class test/Weapon : kotlin/Enum<test/Weapon> {
+
+      private constructor()
+
+      ROCK,
+
+      PAPER,
+
+      SCISSORS,
+
+      // has Enum.entries
+    }
+
+    public final enum entry test/Weapon.PAPER : test/Weapon {
+    }
+
+    public final enum entry test/Weapon.ROCK : test/Weapon {
+    }
+
+    public final enum entry test/Weapon.SCISSORS : test/Weapon {
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.v1.fir.txt

@@ -0,0 +1,72 @@
+library {
+  // module name: <enum.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/EnumArray
+    // class name: test/JustEnum
+    // class name: test/Weapon
+
+    // signature: test/C1|null[0]
+    @test/JustEnum(weapon = test/Weapon.SCISSORS)
+    @test/EnumArray(enumArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/C2|null[0]
+    @test/EnumArray(enumArray = [test/Weapon.PAPER, test/Weapon.ROCK])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/EnumArray|null[0]
+    public final annotation class test/EnumArray : kotlin/Annotation {
+
+      // signature: test/EnumArray.<init>|-6965179920057674266[0]
+      public constructor(enumArray: kotlin/Array<test/Weapon>)
+
+      // signature: test/EnumArray.enumArray|-1032102509447694281[0]
+      public final val enumArray: kotlin/Array<test/Weapon>
+        // signature: test/EnumArray.enumArray.<get-enumArray>|913789251105993902[0]
+        public final get
+    }
+
+    // signature: test/JustEnum|null[0]
+    public final annotation class test/JustEnum : kotlin/Annotation {
+
+      // signature: test/JustEnum.<init>|520094243120006516[0]
+      public constructor(weapon: test/Weapon)
+
+      // signature: test/JustEnum.weapon|187372160426561863[0]
+      public final val weapon: test/Weapon
+        // signature: test/JustEnum.weapon.<get-weapon>|-151232346567386467[0]
+        public final get
+    }
+
+    // signature: test/Weapon|null[0]
+    public final enum class test/Weapon : kotlin/Enum<test/Weapon> {
+
+      // signature: test/Weapon.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: test/Weapon.ROCK|null[0]
+      ROCK,
+
+      // signature: test/Weapon.PAPER|null[0]
+      PAPER,
+
+      // signature: test/Weapon.SCISSORS|null[0]
+      SCISSORS,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.v1.txt

@@ -1,25 +1,87 @@
-package test {
-    // Signature: test/C1|null[0]
-    @JustEnum(weapon = Weapon.SCISSORS) @EnumArray(enumArray = {}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) class C2 constructor()
-    // Signature: test/EnumArray|null[0]
-    annotation class EnumArray constructor(enumArray: Array<Weapon>) : Annotation {
-        // Signature: test/EnumArray.enumArray|-1032102509447694281[0]
-        val enumArray: Array<Weapon>
+library {
+  // module name: <enum.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/EnumArray
+    // class name: test/JustEnum
+    // class name: test/Weapon
+    // class name: test/Weapon.PAPER
+    // class name: test/Weapon.ROCK
+    // class name: test/Weapon.SCISSORS
+
+    // signature: test/C1|null[0]
+    @test/JustEnum(weapon = test/Weapon.SCISSORS)
+    @test/EnumArray(enumArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: test/JustEnum|null[0]
-    annotation class JustEnum constructor(weapon: Weapon) : Annotation {
-        // Signature: test/JustEnum.weapon|187372160426561863[0]
-        val weapon: Weapon
+
+    // signature: test/C2|null[0]
+    @test/EnumArray(enumArray = [test/Weapon.PAPER, test/Weapon.ROCK])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: test/Weapon|null[0]
-    enum class Weapon private constructor() : Enum<Weapon> {
-        // Signature: test/Weapon.ROCK|null[0]
-        enum entry ROCK
-        // Signature: test/Weapon.PAPER|null[0]
-        enum entry PAPER
-        // Signature: test/Weapon.SCISSORS|null[0]
-        enum entry SCISSORS
+
+    // signature: test/EnumArray|null[0]
+    public final annotation class test/EnumArray : kotlin/Annotation {
+
+      // signature: test/EnumArray.<init>|-6965179920057674266[0]
+      public constructor(enumArray: kotlin/Array<test/Weapon>)
+
+      // signature: test/EnumArray.enumArray|-1032102509447694281[0]
+      public final val enumArray: kotlin/Array<test/Weapon>
+        // signature: test/EnumArray.enumArray.<get-enumArray>|913789251105993902[0]
+        public final get
     }
+
+    // signature: test/JustEnum|null[0]
+    public final annotation class test/JustEnum : kotlin/Annotation {
+
+      // signature: test/JustEnum.<init>|520094243120006516[0]
+      public constructor(weapon: test/Weapon)
+
+      // signature: test/JustEnum.weapon|187372160426561863[0]
+      public final val weapon: test/Weapon
+        // signature: test/JustEnum.weapon.<get-weapon>|-151232346567386467[0]
+        public final get
+    }
+
+    // signature: test/Weapon|null[0]
+    public final enum class test/Weapon : kotlin/Enum<test/Weapon> {
+
+      // signature: test/Weapon.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: test/Weapon.ROCK|null[0]
+      ROCK,
+
+      // signature: test/Weapon.PAPER|null[0]
+      PAPER,
+
+      // signature: test/Weapon.SCISSORS|null[0]
+      SCISSORS,
+
+      // has Enum.entries
+    }
+
+    // signature: test/Weapon.PAPER|null[0]
+    public final enum entry test/Weapon.PAPER : test/Weapon {
+    }
+
+    // signature: test/Weapon.ROCK|null[0]
+    public final enum entry test/Weapon.ROCK : test/Weapon {
+    }
+
+    // signature: test/Weapon.SCISSORS|null[0]
+    public final enum entry test/Weapon.SCISSORS : test/Weapon {
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.v2.fir.txt

@@ -0,0 +1,72 @@
+library {
+  // module name: <enum.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/EnumArray
+    // class name: test/JustEnum
+    // class name: test/Weapon
+
+    // signature: test/C1|null[0]
+    @test/JustEnum(weapon = test/Weapon.SCISSORS)
+    @test/EnumArray(enumArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/C2|null[0]
+    @test/EnumArray(enumArray = [test/Weapon.PAPER, test/Weapon.ROCK])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/EnumArray|null[0]
+    public final annotation class test/EnumArray : kotlin/Annotation {
+
+      // signature: test/EnumArray.<init>|<init>(kotlin.Array<test.Weapon>){}[0]
+      public constructor(enumArray: kotlin/Array<test/Weapon>)
+
+      // signature: test/EnumArray.enumArray|{}enumArray[0]
+      public final val enumArray: kotlin/Array<test/Weapon>
+        // signature: test/EnumArray.enumArray.<get-enumArray>|<get-enumArray>(){}[0]
+        public final get
+    }
+
+    // signature: test/JustEnum|null[0]
+    public final annotation class test/JustEnum : kotlin/Annotation {
+
+      // signature: test/JustEnum.<init>|<init>(test.Weapon){}[0]
+      public constructor(weapon: test/Weapon)
+
+      // signature: test/JustEnum.weapon|{}weapon[0]
+      public final val weapon: test/Weapon
+        // signature: test/JustEnum.weapon.<get-weapon>|<get-weapon>(){}[0]
+        public final get
+    }
+
+    // signature: test/Weapon|null[0]
+    public final enum class test/Weapon : kotlin/Enum<test/Weapon> {
+
+      // signature: test/Weapon.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: test/Weapon.ROCK|null[0]
+      ROCK,
+
+      // signature: test/Weapon.PAPER|null[0]
+      PAPER,
+
+      // signature: test/Weapon.SCISSORS|null[0]
+      SCISSORS,
+
+      // has Enum.entries
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/enum.v2.txt

@@ -1,25 +1,87 @@
-package test {
-    // Signature: test/C1|null[0]
-    @JustEnum(weapon = Weapon.SCISSORS) @EnumArray(enumArray = {}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @EnumArray(enumArray = {Weapon.PAPER, Weapon.ROCK}) class C2 constructor()
-    // Signature: test/EnumArray|null[0]
-    annotation class EnumArray constructor(enumArray: Array<Weapon>) : Annotation {
-        // Signature: test/EnumArray.enumArray|{}enumArray[0]
-        val enumArray: Array<Weapon>
+library {
+  // module name: <enum.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/EnumArray
+    // class name: test/JustEnum
+    // class name: test/Weapon
+    // class name: test/Weapon.PAPER
+    // class name: test/Weapon.ROCK
+    // class name: test/Weapon.SCISSORS
+
+    // signature: test/C1|null[0]
+    @test/JustEnum(weapon = test/Weapon.SCISSORS)
+    @test/EnumArray(enumArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: test/JustEnum|null[0]
-    annotation class JustEnum constructor(weapon: Weapon) : Annotation {
-        // Signature: test/JustEnum.weapon|{}weapon[0]
-        val weapon: Weapon
+
+    // signature: test/C2|null[0]
+    @test/EnumArray(enumArray = [test/Weapon.PAPER, test/Weapon.ROCK])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: test/Weapon|null[0]
-    enum class Weapon private constructor() : Enum<Weapon> {
-        // Signature: test/Weapon.ROCK|null[0]
-        enum entry ROCK
-        // Signature: test/Weapon.PAPER|null[0]
-        enum entry PAPER
-        // Signature: test/Weapon.SCISSORS|null[0]
-        enum entry SCISSORS
+
+    // signature: test/EnumArray|null[0]
+    public final annotation class test/EnumArray : kotlin/Annotation {
+
+      // signature: test/EnumArray.<init>|<init>(kotlin.Array<test.Weapon>){}[0]
+      public constructor(enumArray: kotlin/Array<test/Weapon>)
+
+      // signature: test/EnumArray.enumArray|{}enumArray[0]
+      public final val enumArray: kotlin/Array<test/Weapon>
+        // signature: test/EnumArray.enumArray.<get-enumArray>|<get-enumArray>(){}[0]
+        public final get
     }
+
+    // signature: test/JustEnum|null[0]
+    public final annotation class test/JustEnum : kotlin/Annotation {
+
+      // signature: test/JustEnum.<init>|<init>(test.Weapon){}[0]
+      public constructor(weapon: test/Weapon)
+
+      // signature: test/JustEnum.weapon|{}weapon[0]
+      public final val weapon: test/Weapon
+        // signature: test/JustEnum.weapon.<get-weapon>|<get-weapon>(){}[0]
+        public final get
+    }
+
+    // signature: test/Weapon|null[0]
+    public final enum class test/Weapon : kotlin/Enum<test/Weapon> {
+
+      // signature: test/Weapon.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: test/Weapon.ROCK|null[0]
+      ROCK,
+
+      // signature: test/Weapon.PAPER|null[0]
+      PAPER,
+
+      // signature: test/Weapon.SCISSORS|null[0]
+      SCISSORS,
+
+      // has Enum.entries
+    }
+
+    // signature: test/Weapon.PAPER|null[0]
+    public final enum entry test/Weapon.PAPER : test/Weapon {
+    }
+
+    // signature: test/Weapon.ROCK|null[0]
+    public final enum entry test/Weapon.ROCK : test/Weapon {
+    }
+
+    // signature: test/Weapon.SCISSORS|null[0]
+    public final enum entry test/Weapon.SCISSORS : test/Weapon {
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 
 annotation class PrimitiveArrays(

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.txt

@@ -1,14 +1,52 @@
-package test {
-    @PrimitiveArrays(booleanArray = {true, false, true}, byteArray = {-7.toByte(), 7.toByte()}, charArray = {\u0025 ('%'), \u007A ('z')}, doubleArray = {-3.14.toDouble()}, floatArray = {2.72.toFloat(), 0.0.toFloat()}, intArray = {239017, -1}, longArray = {123456789123456789.toLong()}, shortArray = {239.toShort()}) class C1 constructor()
-    @PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleArray = {}, floatArray = {}, intArray = {}, longArray = {}, shortArray = {}) class C2 constructor()
-    annotation class PrimitiveArrays constructor(byteArray: ByteArray, charArray: CharArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray, booleanArray: BooleanArray) : Annotation {
-        val booleanArray: BooleanArray
-        val byteArray: ByteArray
-        val charArray: CharArray
-        val doubleArray: DoubleArray
-        val floatArray: FloatArray
-        val intArray: IntArray
-        val longArray: LongArray
-        val shortArray: ShortArray
+library {
+  // module name: <primitiveArrays.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/PrimitiveArrays
+
+    @test/PrimitiveArrays(byteArray = [-7.toByte(), 7.toByte()], charArray = ['%', 'z'], shortArray = [239.toShort()], intArray = [239017, -1], longArray = [123456789123456789L], floatArray = [2.72f, 0.0f], doubleArray = [-3.14], booleanArray = [true, false, true])
+    public final class test/C1 : kotlin/Any {
+
+      public constructor()
     }
+
+    @test/PrimitiveArrays(byteArray = [], charArray = [], shortArray = [], intArray = [], longArray = [], floatArray = [], doubleArray = [], booleanArray = [])
+    public final class test/C2 : kotlin/Any {
+
+      public constructor()
+    }
+
+    public final annotation class test/PrimitiveArrays : kotlin/Annotation {
+
+      public constructor(byteArray: kotlin/ByteArray, charArray: kotlin/CharArray, shortArray: kotlin/ShortArray, intArray: kotlin/IntArray, longArray: kotlin/LongArray, floatArray: kotlin/FloatArray, doubleArray: kotlin/DoubleArray, booleanArray: kotlin/BooleanArray)
+
+      public final val booleanArray: kotlin/BooleanArray
+        public final get
+
+      public final val byteArray: kotlin/ByteArray
+        public final get
+
+      public final val charArray: kotlin/CharArray
+        public final get
+
+      public final val doubleArray: kotlin/DoubleArray
+        public final get
+
+      public final val floatArray: kotlin/FloatArray
+        public final get
+
+      public final val intArray: kotlin/IntArray
+        public final get
+
+      public final val longArray: kotlin/LongArray
+        public final get
+
+      public final val shortArray: kotlin/ShortArray
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.v1.txt

@@ -1,25 +1,74 @@
-package test {
-    // Signature: test/C1|null[0]
-    @PrimitiveArrays(booleanArray = {true, false, true}, byteArray = {-7.toByte(), 7.toByte()}, charArray = {\u0025 ('%'), \u007A ('z')}, doubleArray = {-3.14.toDouble()}, floatArray = {2.72.toFloat(), 0.0.toFloat()}, intArray = {239017, -1}, longArray = {123456789123456789.toLong()}, shortArray = {239.toShort()}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleArray = {}, floatArray = {}, intArray = {}, longArray = {}, shortArray = {}) class C2 constructor()
-    // Signature: test/PrimitiveArrays|null[0]
-    annotation class PrimitiveArrays constructor(byteArray: ByteArray, charArray: CharArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray, booleanArray: BooleanArray) : Annotation {
-        // Signature: test/PrimitiveArrays.booleanArray|7605527965651232515[0]
-        val booleanArray: BooleanArray
-        // Signature: test/PrimitiveArrays.byteArray|-2314777124899298189[0]
-        val byteArray: ByteArray
-        // Signature: test/PrimitiveArrays.charArray|-5349931751208968301[0]
-        val charArray: CharArray
-        // Signature: test/PrimitiveArrays.doubleArray|-3027997348205759511[0]
-        val doubleArray: DoubleArray
-        // Signature: test/PrimitiveArrays.floatArray|-863616440006860352[0]
-        val floatArray: FloatArray
-        // Signature: test/PrimitiveArrays.intArray|-5845507301569286943[0]
-        val intArray: IntArray
-        // Signature: test/PrimitiveArrays.longArray|-261136028309834719[0]
-        val longArray: LongArray
-        // Signature: test/PrimitiveArrays.shortArray|3516401755230006906[0]
-        val shortArray: ShortArray
+library {
+  // module name: <primitiveArrays.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/PrimitiveArrays
+
+    // signature: test/C1|null[0]
+    @test/PrimitiveArrays(byteArray = [-7.toByte(), 7.toByte()], charArray = ['%', 'z'], shortArray = [239.toShort()], intArray = [239017, -1], longArray = [123456789123456789L], floatArray = [2.72f, 0.0f], doubleArray = [-3.14], booleanArray = [true, false, true])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|-5645683436151566731[0]
+      public constructor()
     }
+
+    // signature: test/C2|null[0]
+    @test/PrimitiveArrays(byteArray = [], charArray = [], shortArray = [], intArray = [], longArray = [], floatArray = [], doubleArray = [], booleanArray = [])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+
+    // signature: test/PrimitiveArrays|null[0]
+    public final annotation class test/PrimitiveArrays : kotlin/Annotation {
+
+      // signature: test/PrimitiveArrays.<init>|-4916018512902367750[0]
+      public constructor(byteArray: kotlin/ByteArray, charArray: kotlin/CharArray, shortArray: kotlin/ShortArray, intArray: kotlin/IntArray, longArray: kotlin/LongArray, floatArray: kotlin/FloatArray, doubleArray: kotlin/DoubleArray, booleanArray: kotlin/BooleanArray)
+
+      // signature: test/PrimitiveArrays.booleanArray|7605527965651232515[0]
+      public final val booleanArray: kotlin/BooleanArray
+        // signature: test/PrimitiveArrays.booleanArray.<get-booleanArray>|-1483974669542225092[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.byteArray|-2314777124899298189[0]
+      public final val byteArray: kotlin/ByteArray
+        // signature: test/PrimitiveArrays.byteArray.<get-byteArray>|1184466848294423218[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.charArray|-5349931751208968301[0]
+      public final val charArray: kotlin/CharArray
+        // signature: test/PrimitiveArrays.charArray.<get-charArray>|-8841051727055591008[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.doubleArray|-3027997348205759511[0]
+      public final val doubleArray: kotlin/DoubleArray
+        // signature: test/PrimitiveArrays.doubleArray.<get-doubleArray>|-8332107536960256489[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.floatArray|-863616440006860352[0]
+      public final val floatArray: kotlin/FloatArray
+        // signature: test/PrimitiveArrays.floatArray.<get-floatArray>|-7251674888770048121[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.intArray|-5845507301569286943[0]
+      public final val intArray: kotlin/IntArray
+        // signature: test/PrimitiveArrays.intArray.<get-intArray>|8581538667026869746[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.longArray|-261136028309834719[0]
+      public final val longArray: kotlin/LongArray
+        // signature: test/PrimitiveArrays.longArray.<get-longArray>|7513485594208747900[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.shortArray|3516401755230006906[0]
+      public final val shortArray: kotlin/ShortArray
+        // signature: test/PrimitiveArrays.shortArray.<get-shortArray>|6916129091578524572[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitiveArrays.v2.txt

@@ -1,25 +1,74 @@
-package test {
-    // Signature: test/C1|null[0]
-    @PrimitiveArrays(booleanArray = {true, false, true}, byteArray = {-7.toByte(), 7.toByte()}, charArray = {\u0025 ('%'), \u007A ('z')}, doubleArray = {-3.14.toDouble()}, floatArray = {2.72.toFloat(), 0.0.toFloat()}, intArray = {239017, -1}, longArray = {123456789123456789.toLong()}, shortArray = {239.toShort()}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @PrimitiveArrays(booleanArray = {}, byteArray = {}, charArray = {}, doubleArray = {}, floatArray = {}, intArray = {}, longArray = {}, shortArray = {}) class C2 constructor()
-    // Signature: test/PrimitiveArrays|null[0]
-    annotation class PrimitiveArrays constructor(byteArray: ByteArray, charArray: CharArray, shortArray: ShortArray, intArray: IntArray, longArray: LongArray, floatArray: FloatArray, doubleArray: DoubleArray, booleanArray: BooleanArray) : Annotation {
-        // Signature: test/PrimitiveArrays.booleanArray|{}booleanArray[0]
-        val booleanArray: BooleanArray
-        // Signature: test/PrimitiveArrays.byteArray|{}byteArray[0]
-        val byteArray: ByteArray
-        // Signature: test/PrimitiveArrays.charArray|{}charArray[0]
-        val charArray: CharArray
-        // Signature: test/PrimitiveArrays.doubleArray|{}doubleArray[0]
-        val doubleArray: DoubleArray
-        // Signature: test/PrimitiveArrays.floatArray|{}floatArray[0]
-        val floatArray: FloatArray
-        // Signature: test/PrimitiveArrays.intArray|{}intArray[0]
-        val intArray: IntArray
-        // Signature: test/PrimitiveArrays.longArray|{}longArray[0]
-        val longArray: LongArray
-        // Signature: test/PrimitiveArrays.shortArray|{}shortArray[0]
-        val shortArray: ShortArray
+library {
+  // module name: <primitiveArrays.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/PrimitiveArrays
+
+    // signature: test/C1|null[0]
+    @test/PrimitiveArrays(byteArray = [-7.toByte(), 7.toByte()], charArray = ['%', 'z'], shortArray = [239.toShort()], intArray = [239017, -1], longArray = [123456789123456789L], floatArray = [2.72f, 0.0f], doubleArray = [-3.14], booleanArray = [true, false, true])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|<init>(){}[0]
+      public constructor()
     }
+
+    // signature: test/C2|null[0]
+    @test/PrimitiveArrays(byteArray = [], charArray = [], shortArray = [], intArray = [], longArray = [], floatArray = [], doubleArray = [], booleanArray = [])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|<init>(){}[0]
+      public constructor()
+    }
+
+    // signature: test/PrimitiveArrays|null[0]
+    public final annotation class test/PrimitiveArrays : kotlin/Annotation {
+
+      // signature: test/PrimitiveArrays.<init>|<init>(kotlin.ByteArray;kotlin.CharArray;kotlin.ShortArray;kotlin.IntArray;kotlin.LongArray;kotlin.FloatArray;kotlin.DoubleArray;kotlin.BooleanArray){}[0]
+      public constructor(byteArray: kotlin/ByteArray, charArray: kotlin/CharArray, shortArray: kotlin/ShortArray, intArray: kotlin/IntArray, longArray: kotlin/LongArray, floatArray: kotlin/FloatArray, doubleArray: kotlin/DoubleArray, booleanArray: kotlin/BooleanArray)
+
+      // signature: test/PrimitiveArrays.booleanArray|{}booleanArray[0]
+      public final val booleanArray: kotlin/BooleanArray
+        // signature: test/PrimitiveArrays.booleanArray.<get-booleanArray>|<get-booleanArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.byteArray|{}byteArray[0]
+      public final val byteArray: kotlin/ByteArray
+        // signature: test/PrimitiveArrays.byteArray.<get-byteArray>|<get-byteArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.charArray|{}charArray[0]
+      public final val charArray: kotlin/CharArray
+        // signature: test/PrimitiveArrays.charArray.<get-charArray>|<get-charArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.doubleArray|{}doubleArray[0]
+      public final val doubleArray: kotlin/DoubleArray
+        // signature: test/PrimitiveArrays.doubleArray.<get-doubleArray>|<get-doubleArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.floatArray|{}floatArray[0]
+      public final val floatArray: kotlin/FloatArray
+        // signature: test/PrimitiveArrays.floatArray.<get-floatArray>|<get-floatArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.intArray|{}intArray[0]
+      public final val intArray: kotlin/IntArray
+        // signature: test/PrimitiveArrays.intArray.<get-intArray>|<get-intArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.longArray|{}longArray[0]
+      public final val longArray: kotlin/LongArray
+        // signature: test/PrimitiveArrays.longArray.<get-longArray>|<get-longArray>(){}[0]
+        public final get
+
+      // signature: test/PrimitiveArrays.shortArray|{}shortArray[0]
+      public final val shortArray: kotlin/ShortArray
+        // signature: test/PrimitiveArrays.shortArray.<get-shortArray>|<get-shortArray>(){}[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 
 annotation class Primitives(

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.txt

@@ -1,13 +1,45 @@
-package test {
-    @Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double = -3.14.toDouble(), float = 2.72.toFloat(), int = 239017, long = 123456789123456789.toLong(), short = 239.toShort()) class C constructor()
-    annotation class Primitives constructor(byte: Byte, char: Char, short: Short, int: Int, long: Long, float: Float, double: Double, boolean: Boolean) : Annotation {
-        val boolean: Boolean
-        val byte: Byte
-        val char: Char
-        val double: Double
-        val float: Float
-        val int: Int
-        val long: Long
-        val short: Short
+library {
+  // module name: <primitives.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C
+    // class name: test/Primitives
+
+    @test/Primitives(byte = 7.toByte(), char = '%', short = 239.toShort(), int = 239017, long = 123456789123456789L, float = 2.72f, double = -3.14, boolean = true)
+    public final class test/C : kotlin/Any {
+
+      public constructor()
     }
+
+    public final annotation class test/Primitives : kotlin/Annotation {
+
+      public constructor(byte: kotlin/Byte, char: kotlin/Char, short: kotlin/Short, int: kotlin/Int, long: kotlin/Long, float: kotlin/Float, double: kotlin/Double, boolean: kotlin/Boolean)
+
+      public final val boolean: kotlin/Boolean
+        public final get
+
+      public final val byte: kotlin/Byte
+        public final get
+
+      public final val char: kotlin/Char
+        public final get
+
+      public final val double: kotlin/Double
+        public final get
+
+      public final val float: kotlin/Float
+        public final get
+
+      public final val int: kotlin/Int
+        public final get
+
+      public final val long: kotlin/Long
+        public final get
+
+      public final val short: kotlin/Short
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.v1.txt

@@ -1,23 +1,65 @@
-package test {
-    // Signature: test/C|null[0]
-    @Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double = -3.14.toDouble(), float = 2.72.toFloat(), int = 239017, long = 123456789123456789.toLong(), short = 239.toShort()) class C constructor()
-    // Signature: test/Primitives|null[0]
-    annotation class Primitives constructor(byte: Byte, char: Char, short: Short, int: Int, long: Long, float: Float, double: Double, boolean: Boolean) : Annotation {
-        // Signature: test/Primitives.boolean|-4261332457766342551[0]
-        val boolean: Boolean
-        // Signature: test/Primitives.byte|-96849965763790584[0]
-        val byte: Byte
-        // Signature: test/Primitives.char|-1670337955414892634[0]
-        val char: Char
-        // Signature: test/Primitives.double|2356391280675975773[0]
-        val double: Double
-        // Signature: test/Primitives.float|3027698144133593704[0]
-        val float: Float
-        // Signature: test/Primitives.int|4038882325283937173[0]
-        val int: Int
-        // Signature: test/Primitives.long|-3528812958611327186[0]
-        val long: Long
-        // Signature: test/Primitives.short|2683753303457941763[0]
-        val short: Short
+library {
+  // module name: <primitives.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C
+    // class name: test/Primitives
+
+    // signature: test/C|null[0]
+    @test/Primitives(byte = 7.toByte(), char = '%', short = 239.toShort(), int = 239017, long = 123456789123456789L, float = 2.72f, double = -3.14, boolean = true)
+    public final class test/C : kotlin/Any {
+
+      // signature: test/C.<init>|-5645683436151566731[0]
+      public constructor()
     }
+
+    // signature: test/Primitives|null[0]
+    public final annotation class test/Primitives : kotlin/Annotation {
+
+      // signature: test/Primitives.<init>|4757917789516536964[0]
+      public constructor(byte: kotlin/Byte, char: kotlin/Char, short: kotlin/Short, int: kotlin/Int, long: kotlin/Long, float: kotlin/Float, double: kotlin/Double, boolean: kotlin/Boolean)
+
+      // signature: test/Primitives.boolean|-4261332457766342551[0]
+      public final val boolean: kotlin/Boolean
+        // signature: test/Primitives.boolean.<get-boolean>|517708060946479255[0]
+        public final get
+
+      // signature: test/Primitives.byte|-96849965763790584[0]
+      public final val byte: kotlin/Byte
+        // signature: test/Primitives.byte.<get-byte>|310937544708577298[0]
+        public final get
+
+      // signature: test/Primitives.char|-1670337955414892634[0]
+      public final val char: kotlin/Char
+        // signature: test/Primitives.char.<get-char>|1437740164735763428[0]
+        public final get
+
+      // signature: test/Primitives.double|2356391280675975773[0]
+      public final val double: kotlin/Double
+        // signature: test/Primitives.double.<get-double>|-6763865848971261464[0]
+        public final get
+
+      // signature: test/Primitives.float|3027698144133593704[0]
+      public final val float: kotlin/Float
+        // signature: test/Primitives.float.<get-float>|1344292707679993701[0]
+        public final get
+
+      // signature: test/Primitives.int|4038882325283937173[0]
+      public final val int: kotlin/Int
+        // signature: test/Primitives.int.<get-int>|-626442327997506045[0]
+        public final get
+
+      // signature: test/Primitives.long|-3528812958611327186[0]
+      public final val long: kotlin/Long
+        // signature: test/Primitives.long.<get-long>|-8542925932497577082[0]
+        public final get
+
+      // signature: test/Primitives.short|2683753303457941763[0]
+      public final val short: kotlin/Short
+        // signature: test/Primitives.short.<get-short>|-8651028235276253274[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/primitives.v2.txt

@@ -1,23 +1,65 @@
-package test {
-    // Signature: test/C|null[0]
-    @Primitives(boolean = true, byte = 7.toByte(), char = \u0025 ('%'), double = -3.14.toDouble(), float = 2.72.toFloat(), int = 239017, long = 123456789123456789.toLong(), short = 239.toShort()) class C constructor()
-    // Signature: test/Primitives|null[0]
-    annotation class Primitives constructor(byte: Byte, char: Char, short: Short, int: Int, long: Long, float: Float, double: Double, boolean: Boolean) : Annotation {
-        // Signature: test/Primitives.boolean|{}boolean[0]
-        val boolean: Boolean
-        // Signature: test/Primitives.byte|{}byte[0]
-        val byte: Byte
-        // Signature: test/Primitives.char|{}char[0]
-        val char: Char
-        // Signature: test/Primitives.double|{}double[0]
-        val double: Double
-        // Signature: test/Primitives.float|{}float[0]
-        val float: Float
-        // Signature: test/Primitives.int|{}int[0]
-        val int: Int
-        // Signature: test/Primitives.long|{}long[0]
-        val long: Long
-        // Signature: test/Primitives.short|{}short[0]
-        val short: Short
+library {
+  // module name: <primitives.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C
+    // class name: test/Primitives
+
+    // signature: test/C|null[0]
+    @test/Primitives(byte = 7.toByte(), char = '%', short = 239.toShort(), int = 239017, long = 123456789123456789L, float = 2.72f, double = -3.14, boolean = true)
+    public final class test/C : kotlin/Any {
+
+      // signature: test/C.<init>|<init>(){}[0]
+      public constructor()
     }
+
+    // signature: test/Primitives|null[0]
+    public final annotation class test/Primitives : kotlin/Annotation {
+
+      // signature: test/Primitives.<init>|<init>(kotlin.Byte;kotlin.Char;kotlin.Short;kotlin.Int;kotlin.Long;kotlin.Float;kotlin.Double;kotlin.Boolean){}[0]
+      public constructor(byte: kotlin/Byte, char: kotlin/Char, short: kotlin/Short, int: kotlin/Int, long: kotlin/Long, float: kotlin/Float, double: kotlin/Double, boolean: kotlin/Boolean)
+
+      // signature: test/Primitives.boolean|{}boolean[0]
+      public final val boolean: kotlin/Boolean
+        // signature: test/Primitives.boolean.<get-boolean>|<get-boolean>(){}[0]
+        public final get
+
+      // signature: test/Primitives.byte|{}byte[0]
+      public final val byte: kotlin/Byte
+        // signature: test/Primitives.byte.<get-byte>|<get-byte>(){}[0]
+        public final get
+
+      // signature: test/Primitives.char|{}char[0]
+      public final val char: kotlin/Char
+        // signature: test/Primitives.char.<get-char>|<get-char>(){}[0]
+        public final get
+
+      // signature: test/Primitives.double|{}double[0]
+      public final val double: kotlin/Double
+        // signature: test/Primitives.double.<get-double>|<get-double>(){}[0]
+        public final get
+
+      // signature: test/Primitives.float|{}float[0]
+      public final val float: kotlin/Float
+        // signature: test/Primitives.float.<get-float>|<get-float>(){}[0]
+        public final get
+
+      // signature: test/Primitives.int|{}int[0]
+      public final val int: kotlin/Int
+        // signature: test/Primitives.int.<get-int>|<get-int>(){}[0]
+        public final get
+
+      // signature: test/Primitives.long|{}long[0]
+      public final val long: kotlin/Long
+        // signature: test/Primitives.long.<get-long>|<get-long>(){}[0]
+        public final get
+
+      // signature: test/Primitives.short|{}short[0]
+      public final val short: kotlin/Short
+        // signature: test/Primitives.short.<get-short>|<get-short>(){}[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 
 annotation class JustString(val string: String)

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.txt

@@ -1,10 +1,41 @@
-package test {
-    @JustString(string = "kotlin") @StringArray(stringArray = {}) class C1 constructor()
-    @StringArray(stringArray = {"java", ""}) class C2 constructor()
-    annotation class JustString constructor(string: String) : Annotation {
-        val string: String
+library {
+  // module name: <string.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/JustString
+    // class name: test/StringArray
+
+    @test/JustString(string = "kotlin")
+    @test/StringArray(stringArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      public constructor()
     }
-    annotation class StringArray constructor(stringArray: Array<String>) : Annotation {
-        val stringArray: Array<String>
+
+    @test/StringArray(stringArray = ["java", ""])
+    public final class test/C2 : kotlin/Any {
+
+      public constructor()
     }
+
+    public final annotation class test/JustString : kotlin/Annotation {
+
+      public constructor(string: kotlin/String)
+
+      public final val string: kotlin/String
+        public final get
+    }
+
+    public final annotation class test/StringArray : kotlin/Annotation {
+
+      public constructor(stringArray: kotlin/Array<kotlin/String>)
+
+      public final val stringArray: kotlin/Array<kotlin/String>
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.v1.txt

@@ -1,16 +1,53 @@
-package test {
-    // Signature: test/C1|null[0]
-    @JustString(string = "kotlin") @StringArray(stringArray = {}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @StringArray(stringArray = {"java", ""}) class C2 constructor()
-    // Signature: test/JustString|null[0]
-    annotation class JustString constructor(string: String) : Annotation {
-        // Signature: test/JustString.string|-528183805128847417[0]
-        val string: String
+library {
+  // module name: <string.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/JustString
+    // class name: test/StringArray
+
+    // signature: test/C1|null[0]
+    @test/JustString(string = "kotlin")
+    @test/StringArray(stringArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: test/StringArray|null[0]
-    annotation class StringArray constructor(stringArray: Array<String>) : Annotation {
-        // Signature: test/StringArray.stringArray|3224078221487065108[0]
-        val stringArray: Array<String>
+
+    // signature: test/C2|null[0]
+    @test/StringArray(stringArray = ["java", ""])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|-5645683436151566731[0]
+      public constructor()
     }
+
+    // signature: test/JustString|null[0]
+    public final annotation class test/JustString : kotlin/Annotation {
+
+      // signature: test/JustString.<init>|1280618353163213788[0]
+      public constructor(string: kotlin/String)
+
+      // signature: test/JustString.string|-528183805128847417[0]
+      public final val string: kotlin/String
+        // signature: test/JustString.string.<get-string>|3519820768600764381[0]
+        public final get
+    }
+
+    // signature: test/StringArray|null[0]
+    public final annotation class test/StringArray : kotlin/Annotation {
+
+      // signature: test/StringArray.<init>|5393043463829665764[0]
+      public constructor(stringArray: kotlin/Array<kotlin/String>)
+
+      // signature: test/StringArray.stringArray|3224078221487065108[0]
+      public final val stringArray: kotlin/Array<kotlin/String>
+        // signature: test/StringArray.stringArray.<get-stringArray>|-999420313937698549[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/string.v2.txt

@@ -1,16 +1,53 @@
-package test {
-    // Signature: test/C1|null[0]
-    @JustString(string = "kotlin") @StringArray(stringArray = {}) class C1 constructor()
-    // Signature: test/C2|null[0]
-    @StringArray(stringArray = {"java", ""}) class C2 constructor()
-    // Signature: test/JustString|null[0]
-    annotation class JustString constructor(string: String) : Annotation {
-        // Signature: test/JustString.string|{}string[0]
-        val string: String
+library {
+  // module name: <string.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C2
+    // class name: test/JustString
+    // class name: test/StringArray
+
+    // signature: test/C1|null[0]
+    @test/JustString(string = "kotlin")
+    @test/StringArray(stringArray = [])
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: test/StringArray|null[0]
-    annotation class StringArray constructor(stringArray: Array<String>) : Annotation {
-        // Signature: test/StringArray.stringArray|{}stringArray[0]
-        val stringArray: Array<String>
+
+    // signature: test/C2|null[0]
+    @test/StringArray(stringArray = ["java", ""])
+    public final class test/C2 : kotlin/Any {
+
+      // signature: test/C2.<init>|<init>(){}[0]
+      public constructor()
     }
+
+    // signature: test/JustString|null[0]
+    public final annotation class test/JustString : kotlin/Annotation {
+
+      // signature: test/JustString.<init>|<init>(kotlin.String){}[0]
+      public constructor(string: kotlin/String)
+
+      // signature: test/JustString.string|{}string[0]
+      public final val string: kotlin/String
+        // signature: test/JustString.string.<get-string>|<get-string>(){}[0]
+        public final get
+    }
+
+    // signature: test/StringArray|null[0]
+    public final annotation class test/StringArray : kotlin/Annotation {
+
+      // signature: test/StringArray.<init>|<init>(kotlin.Array<kotlin.String>){}[0]
+      public constructor(stringArray: kotlin/Array<kotlin/String>)
+
+      // signature: test/StringArray.stringArray|{}stringArray[0]
+      public final val stringArray: kotlin/Array<kotlin/String>
+        // signature: test/StringArray.stringArray.<get-stringArray>|<get-stringArray>(){}[0]
+        public final get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.fir.txt

@@ -0,0 +1,38 @@
+library {
+  // module name: <varargs.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/My
+    // class name: test/ann
+    // class name: test/annotated
+
+    public final enum class test/My : kotlin/Enum<test/My> {
+
+      private constructor()
+
+      ALPHA,
+
+      BETA,
+
+      OMEGA,
+
+      // has Enum.entries
+    }
+
+    public final annotation class test/ann : kotlin/Annotation {
+
+      public constructor(vararg m: test/My /* kotlin/Array<out test/My> */)
+
+      public final val m: kotlin/Array<out test/My>
+        public final get
+    }
+
+    @test/ann(m = [test/My.ALPHA, test/My.BETA])
+    public final annotation class test/annotated : kotlin/Annotation {
+
+      public constructor()
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.txt

@@ -1,11 +1,50 @@
-package test {
-    enum class My private constructor() : Enum<My> {
-        enum entry ALPHA
-        enum entry BETA
-        enum entry OMEGA
+library {
+  // module name: <varargs.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/My
+    // class name: test/My.ALPHA
+    // class name: test/My.BETA
+    // class name: test/My.OMEGA
+    // class name: test/ann
+    // class name: test/annotated
+
+    public final enum class test/My : kotlin/Enum<test/My> {
+
+      private constructor()
+
+      ALPHA,
+
+      BETA,
+
+      OMEGA,
+
+      // has Enum.entries
     }
-    annotation class ann constructor(vararg m: My) : Annotation {
-        val m: Array<out My>
+
+    public final enum entry test/My.ALPHA : test/My {
     }
-    @ann(m = {My.ALPHA, My.BETA}) annotation class annotated constructor() : Annotation
+
+    public final enum entry test/My.BETA : test/My {
+    }
+
+    public final enum entry test/My.OMEGA : test/My {
+    }
+
+    public final annotation class test/ann : kotlin/Annotation {
+
+      public constructor(vararg m: test/My /* kotlin/Array<out test/My> */)
+
+      public final val m: kotlin/Array<out test/My>
+        public final get
+    }
+
+    @test/ann(m = [test/My.ALPHA, test/My.BETA])
+    public final annotation class test/annotated : kotlin/Annotation {
+
+      public constructor()
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.v1.fir.txt

@@ -0,0 +1,49 @@
+library {
+  // module name: <varargs.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/My
+    // class name: test/ann
+    // class name: test/annotated
+
+    // signature: test/My|null[0]
+    public final enum class test/My : kotlin/Enum<test/My> {
+
+      // signature: test/My.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: test/My.ALPHA|null[0]
+      ALPHA,
+
+      // signature: test/My.BETA|null[0]
+      BETA,
+
+      // signature: test/My.OMEGA|null[0]
+      OMEGA,
+
+      // has Enum.entries
+    }
+
+    // signature: test/ann|null[0]
+    public final annotation class test/ann : kotlin/Annotation {
+
+      // signature: test/ann.<init>|-2563184725332266251[0]
+      public constructor(vararg m: test/My /* kotlin/Array<out test/My> */)
+
+      // signature: test/ann.m|1584387991504031144[0]
+      public final val m: kotlin/Array<out test/My>
+        // signature: test/ann.m.<get-m>|-4080345507792793848[0]
+        public final get
+    }
+
+    // signature: test/annotated|null[0]
+    @test/ann(m = [test/My.ALPHA, test/My.BETA])
+    public final annotation class test/annotated : kotlin/Annotation {
+
+      // signature: test/annotated.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.v1.txt

@@ -1,18 +1,64 @@
-package test {
-    // Signature: test/My|null[0]
-    enum class My private constructor() : Enum<My> {
-        // Signature: test/My.ALPHA|null[0]
-        enum entry ALPHA
-        // Signature: test/My.BETA|null[0]
-        enum entry BETA
-        // Signature: test/My.OMEGA|null[0]
-        enum entry OMEGA
+library {
+  // module name: <varargs.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/My
+    // class name: test/My.ALPHA
+    // class name: test/My.BETA
+    // class name: test/My.OMEGA
+    // class name: test/ann
+    // class name: test/annotated
+
+    // signature: test/My|null[0]
+    public final enum class test/My : kotlin/Enum<test/My> {
+
+      // signature: test/My.<init>|-5645683436151566731[0]
+      private constructor()
+
+      // signature: test/My.ALPHA|null[0]
+      ALPHA,
+
+      // signature: test/My.BETA|null[0]
+      BETA,
+
+      // signature: test/My.OMEGA|null[0]
+      OMEGA,
+
+      // has Enum.entries
     }
-    // Signature: test/ann|null[0]
-    annotation class ann constructor(vararg m: My) : Annotation {
-        // Signature: test/ann.m|1584387991504031144[0]
-        val m: Array<out My>
+
+    // signature: test/My.ALPHA|null[0]
+    public final enum entry test/My.ALPHA : test/My {
     }
-    // Signature: test/annotated|null[0]
-    @ann(m = {My.ALPHA, My.BETA}) annotation class annotated constructor() : Annotation
+
+    // signature: test/My.BETA|null[0]
+    public final enum entry test/My.BETA : test/My {
+    }
+
+    // signature: test/My.OMEGA|null[0]
+    public final enum entry test/My.OMEGA : test/My {
+    }
+
+    // signature: test/ann|null[0]
+    public final annotation class test/ann : kotlin/Annotation {
+
+      // signature: test/ann.<init>|-2563184725332266251[0]
+      public constructor(vararg m: test/My /* kotlin/Array<out test/My> */)
+
+      // signature: test/ann.m|1584387991504031144[0]
+      public final val m: kotlin/Array<out test/My>
+        // signature: test/ann.m.<get-m>|-4080345507792793848[0]
+        public final get
+    }
+
+    // signature: test/annotated|null[0]
+    @test/ann(m = [test/My.ALPHA, test/My.BETA])
+    public final annotation class test/annotated : kotlin/Annotation {
+
+      // signature: test/annotated.<init>|-5645683436151566731[0]
+      public constructor()
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.v2.fir.txt

@@ -0,0 +1,49 @@
+library {
+  // module name: <varargs.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/My
+    // class name: test/ann
+    // class name: test/annotated
+
+    // signature: test/My|null[0]
+    public final enum class test/My : kotlin/Enum<test/My> {
+
+      // signature: test/My.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: test/My.ALPHA|null[0]
+      ALPHA,
+
+      // signature: test/My.BETA|null[0]
+      BETA,
+
+      // signature: test/My.OMEGA|null[0]
+      OMEGA,
+
+      // has Enum.entries
+    }
+
+    // signature: test/ann|null[0]
+    public final annotation class test/ann : kotlin/Annotation {
+
+      // signature: test/ann.<init>|<init>(kotlin.Array<out|test.My>...){}[0]
+      public constructor(vararg m: test/My /* kotlin/Array<out test/My> */)
+
+      // signature: test/ann.m|{}m[0]
+      public final val m: kotlin/Array<out test/My>
+        // signature: test/ann.m.<get-m>|<get-m>(){}[0]
+        public final get
+    }
+
+    // signature: test/annotated|null[0]
+    @test/ann(m = [test/My.ALPHA, test/My.BETA])
+    public final annotation class test/annotated : kotlin/Annotation {
+
+      // signature: test/annotated.<init>|<init>(){}[0]
+      public constructor()
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationArguments/varargs.v2.txt

@@ -1,18 +1,64 @@
-package test {
-    // Signature: test/My|null[0]
-    enum class My private constructor() : Enum<My> {
-        // Signature: test/My.ALPHA|null[0]
-        enum entry ALPHA
-        // Signature: test/My.BETA|null[0]
-        enum entry BETA
-        // Signature: test/My.OMEGA|null[0]
-        enum entry OMEGA
+library {
+  // module name: <varargs.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/My
+    // class name: test/My.ALPHA
+    // class name: test/My.BETA
+    // class name: test/My.OMEGA
+    // class name: test/ann
+    // class name: test/annotated
+
+    // signature: test/My|null[0]
+    public final enum class test/My : kotlin/Enum<test/My> {
+
+      // signature: test/My.<init>|<init>(){}[0]
+      private constructor()
+
+      // signature: test/My.ALPHA|null[0]
+      ALPHA,
+
+      // signature: test/My.BETA|null[0]
+      BETA,
+
+      // signature: test/My.OMEGA|null[0]
+      OMEGA,
+
+      // has Enum.entries
     }
-    // Signature: test/ann|null[0]
-    annotation class ann constructor(vararg m: My) : Annotation {
-        // Signature: test/ann.m|{}m[0]
-        val m: Array<out My>
+
+    // signature: test/My.ALPHA|null[0]
+    public final enum entry test/My.ALPHA : test/My {
     }
-    // Signature: test/annotated|null[0]
-    @ann(m = {My.ALPHA, My.BETA}) annotation class annotated constructor() : Annotation
+
+    // signature: test/My.BETA|null[0]
+    public final enum entry test/My.BETA : test/My {
+    }
+
+    // signature: test/My.OMEGA|null[0]
+    public final enum entry test/My.OMEGA : test/My {
+    }
+
+    // signature: test/ann|null[0]
+    public final annotation class test/ann : kotlin/Annotation {
+
+      // signature: test/ann.<init>|<init>(kotlin.Array<out|test.My>...){}[0]
+      public constructor(vararg m: test/My /* kotlin/Array<out test/My> */)
+
+      // signature: test/ann.m|{}m[0]
+      public final val m: kotlin/Array<out test/My>
+        // signature: test/ann.m.<get-m>|<get-m>(){}[0]
+        public final get
+    }
+
+    // signature: test/annotated|null[0]
+    @test/ann(m = [test/My.ALPHA, test/My.BETA])
+    public final annotation class test/annotated : kotlin/Annotation {
+
+      // signature: test/annotated.<init>|<init>(){}[0]
+      public constructor()
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.kt

@@ -1,3 +1,4 @@
+// FIR_IDENTICAL
 package test
 
 annotation class anno(val x: String)

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.txt

@@ -1,17 +1,76 @@
-package test {
-    @anno(x = "top level class") class C1 @anno(x = "constructor") constructor() {
-        @anno(x = "member property") val p3: Nothing?
-        @anno(x = "member extension property") val Int.v4: Int
-        @anno(x = "member function") fun f3(@anno(x = "member function parameter") p: Int)
-        @anno(x = "member extension function") fun String.f4()
-        @anno(x = "nested class") class C2 constructor()
-        @anno(x = "companion object") companion object
+library {
+  // module name: <annotationTargets.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C1.C2
+    // class name: test/C1.Companion
+    // class name: test/anno
+
+    @test/anno(x = "top level class")
+    public final class test/C1 : kotlin/Any {
+
+      @test/anno(x = "constructor")
+      public constructor()
+
+      @test/anno(x = "member function")
+      public final fun f3(@test/anno(x = "member function parameter") p: kotlin/Int): kotlin/Unit
+
+      @test/anno(x = "member extension function")
+      public final fun kotlin/String.f4(): kotlin/Unit
+
+      @test/anno(x = "member property")
+      public final val p3: kotlin/Nothing?
+        public final get
+
+      @test/anno(x = "member extension property")
+      public final val kotlin/Int.v4: kotlin/Int
+        public final /* non-default */ get
+
+      // companion object: Companion
+
+      // nested class: C2
+
+      // nested class: Companion
     }
-    annotation class anno constructor(x: String) : Annotation {
-        val x: String
+
+    @test/anno(x = "nested class")
+    public final class test/C1.C2 : kotlin/Any {
+
+      public constructor()
     }
-    @anno(x = "top level function") fun f1(@anno(x = "top level function parameter") p: Int)
-    @anno(x = "extension function") fun Long.f2(@anno(x = "extension function parameter") p: Int)
-    @anno(x = "top level property") val p1: Nothing?
-    @anno(x = "extension property") val Double.p2: Double
-}
+
+    @test/anno(x = "companion object")
+    public final companion object test/C1.Companion : kotlin/Any {
+
+      private constructor()
+    }
+
+    public final annotation class test/anno : kotlin/Annotation {
+
+      public constructor(x: kotlin/String)
+
+      public final val x: kotlin/String
+        public final get
+    }
+
+    package {
+
+      @test/anno(x = "top level function")
+      public final fun f1(@test/anno(x = "top level function parameter") p: kotlin/Int): kotlin/Unit
+
+      @test/anno(x = "extension function")
+      public final fun kotlin/Long.f2(@test/anno(x = "extension function parameter") p: kotlin/Int): kotlin/Unit
+
+      @test/anno(x = "top level property")
+      public final val p1: kotlin/Nothing?
+        public final get
+
+      @test/anno(x = "extension property")
+      public final val kotlin/Double.p2: kotlin/Double
+        public final /* non-default */ get
+    }
+  }
+}

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.v1.txt

@@ -1,30 +1,98 @@
-package test {
-    // Signature: test/C1|null[0]
-    @anno(x = "top level class") class C1 @anno(x = "constructor") constructor() {
-        // Signature: test/C1.p3|-373830470709388280[0]
-        @anno(x = "member property") val p3: Nothing?
-        // Signature: test/C1.v4|-38532081724949562[0]
-        @anno(x = "member extension property") val Int.v4: Int
-        // Signature: test/C1.f3|-21944318592270529[0]
-        @anno(x = "member function") fun f3(@anno(x = "member function parameter") p: Int)
-        // Signature: test/C1.f4|229292746020934047[0]
-        @anno(x = "member extension function") fun String.f4()
-        // Signature: test/C1.C2|null[0]
-        @anno(x = "nested class") class C2 constructor()
-        // Signature: test/C1.Companion|null[0]
-        @anno(x = "companion object") companion object
+library {
+  // module name: <annotationTargets.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C1.C2
+    // class name: test/C1.Companion
+    // class name: test/anno
+
+    // signature: test/C1|null[0]
+    @test/anno(x = "top level class")
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|-5645683436151566731[0]
+      @test/anno(x = "constructor")
+      public constructor()
+
+      // signature: test/C1.f3|-21944318592270529[0]
+      @test/anno(x = "member function")
+      public final fun f3(@test/anno(x = "member function parameter") p: kotlin/Int): kotlin/Unit
+
+      // signature: test/C1.f4|229292746020934047[0]
+      @test/anno(x = "member extension function")
+      public final fun kotlin/String.f4(): kotlin/Unit
+
+      // signature: test/C1.p3|-373830470709388280[0]
+      @test/anno(x = "member property")
+      public final val p3: kotlin/Nothing?
+        // signature: test/C1.p3.<get-p3>|-2557278263413792822[0]
+        public final get
+
+      // signature: test/C1.v4|-38532081724949562[0]
+      @test/anno(x = "member extension property")
+      public final val kotlin/Int.v4: kotlin/Int
+        // signature: test/C1.v4.<get-v4>|8055377869057184256[0]
+        public final /* non-default */ get
+
+      // companion object: Companion
+
+      // nested class: C2
+
+      // nested class: Companion
     }
-    // Signature: test/anno|null[0]
-    annotation class anno constructor(x: String) : Annotation {
-        // Signature: test/anno.x|-8060530855978347579[0]
-        val x: String
+
+    // signature: test/C1.C2|null[0]
+    @test/anno(x = "nested class")
+    public final class test/C1.C2 : kotlin/Any {
+
+      // signature: test/C1.C2.<init>|-5645683436151566731[0]
+      public constructor()
     }
-    // Signature: test/f1|7367719253560189071[0]
-    @anno(x = "top level function") fun f1(@anno(x = "top level function parameter") p: Int)
-    // Signature: test/f2|6524047282310410984[0]
-    @anno(x = "extension function") fun Long.f2(@anno(x = "extension function parameter") p: Int)
-    // Signature: test/p1|7711764890799440087[0]
-    @anno(x = "top level property") val p1: Nothing?
-    // Signature: test/p2|8934898181461715514[0]
-    @anno(x = "extension property") val Double.p2: Double
+
+    // signature: test/C1.Companion|null[0]
+    @test/anno(x = "companion object")
+    public final companion object test/C1.Companion : kotlin/Any {
+
+      // signature: test/C1.Companion.<init>|-5645683436151566731[0]
+      private constructor()
+    }
+
+    // signature: test/anno|null[0]
+    public final annotation class test/anno : kotlin/Annotation {
+
+      // signature: test/anno.<init>|1280618353163213788[0]
+      public constructor(x: kotlin/String)
+
+      // signature: test/anno.x|-8060530855978347579[0]
+      public final val x: kotlin/String
+        // signature: test/anno.x.<get-x>|1482705010654679335[0]
+        public final get
+    }
+
+    package {
+
+      // signature: test/f1|7367719253560189071[0]
+      @test/anno(x = "top level function")
+      public final fun f1(@test/anno(x = "top level function parameter") p: kotlin/Int): kotlin/Unit
+
+      // signature: test/f2|6524047282310410984[0]
+      @test/anno(x = "extension function")
+      public final fun kotlin/Long.f2(@test/anno(x = "extension function parameter") p: kotlin/Int): kotlin/Unit
+
+      // signature: test/p1|7711764890799440087[0]
+      @test/anno(x = "top level property")
+      public final val p1: kotlin/Nothing?
+        // signature: test/p1.<get-p1>|419663188770843259[0]
+        public final get
+
+      // signature: test/p2|8934898181461715514[0]
+      @test/anno(x = "extension property")
+      public final val kotlin/Double.p2: kotlin/Double
+        // signature: test/p2.<get-p2>|-4908997596127971814[0]
+        public final /* non-default */ get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/annotationTargets.v2.txt

@@ -1,30 +1,98 @@
-package test {
-    // Signature: test/C1|null[0]
-    @anno(x = "top level class") class C1 @anno(x = "constructor") constructor() {
-        // Signature: test/C1.p3|{}p3[0]
-        @anno(x = "member property") val p3: Nothing?
-        // Signature: test/C1.v4|@kotlin.Int{}v4[0]
-        @anno(x = "member extension property") val Int.v4: Int
-        // Signature: test/C1.f3|f3(kotlin.Int){}[0]
-        @anno(x = "member function") fun f3(@anno(x = "member function parameter") p: Int)
-        // Signature: test/C1.f4|f4@kotlin.String(){}[0]
-        @anno(x = "member extension function") fun String.f4()
-        // Signature: test/C1.C2|null[0]
-        @anno(x = "nested class") class C2 constructor()
-        // Signature: test/C1.Companion|null[0]
-        @anno(x = "companion object") companion object
+library {
+  // module name: <annotationTargets.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/C1
+    // class name: test/C1.C2
+    // class name: test/C1.Companion
+    // class name: test/anno
+
+    // signature: test/C1|null[0]
+    @test/anno(x = "top level class")
+    public final class test/C1 : kotlin/Any {
+
+      // signature: test/C1.<init>|<init>(){}[0]
+      @test/anno(x = "constructor")
+      public constructor()
+
+      // signature: test/C1.f3|f3(kotlin.Int){}[0]
+      @test/anno(x = "member function")
+      public final fun f3(@test/anno(x = "member function parameter") p: kotlin/Int): kotlin/Unit
+
+      // signature: test/C1.f4|f4@kotlin.String(){}[0]
+      @test/anno(x = "member extension function")
+      public final fun kotlin/String.f4(): kotlin/Unit
+
+      // signature: test/C1.p3|{}p3[0]
+      @test/anno(x = "member property")
+      public final val p3: kotlin/Nothing?
+        // signature: test/C1.p3.<get-p3>|<get-p3>(){}[0]
+        public final get
+
+      // signature: test/C1.v4|@kotlin.Int{}v4[0]
+      @test/anno(x = "member extension property")
+      public final val kotlin/Int.v4: kotlin/Int
+        // signature: test/C1.v4.<get-v4>|<get-v4>@kotlin.Int(){}[0]
+        public final /* non-default */ get
+
+      // companion object: Companion
+
+      // nested class: C2
+
+      // nested class: Companion
     }
-    // Signature: test/anno|null[0]
-    annotation class anno constructor(x: String) : Annotation {
-        // Signature: test/anno.x|{}x[0]
-        val x: String
+
+    // signature: test/C1.C2|null[0]
+    @test/anno(x = "nested class")
+    public final class test/C1.C2 : kotlin/Any {
+
+      // signature: test/C1.C2.<init>|<init>(){}[0]
+      public constructor()
     }
-    // Signature: test/f1|f1(kotlin.Int){}[0]
-    @anno(x = "top level function") fun f1(@anno(x = "top level function parameter") p: Int)
-    // Signature: test/f2|f2@kotlin.Long(kotlin.Int){}[0]
-    @anno(x = "extension function") fun Long.f2(@anno(x = "extension function parameter") p: Int)
-    // Signature: test/p1|{}p1[0]
-    @anno(x = "top level property") val p1: Nothing?
-    // Signature: test/p2|@kotlin.Double{}p2[0]
-    @anno(x = "extension property") val Double.p2: Double
+
+    // signature: test/C1.Companion|null[0]
+    @test/anno(x = "companion object")
+    public final companion object test/C1.Companion : kotlin/Any {
+
+      // signature: test/C1.Companion.<init>|<init>(){}[0]
+      private constructor()
+    }
+
+    // signature: test/anno|null[0]
+    public final annotation class test/anno : kotlin/Annotation {
+
+      // signature: test/anno.<init>|<init>(kotlin.String){}[0]
+      public constructor(x: kotlin/String)
+
+      // signature: test/anno.x|{}x[0]
+      public final val x: kotlin/String
+        // signature: test/anno.x.<get-x>|<get-x>(){}[0]
+        public final get
+    }
+
+    package {
+
+      // signature: test/f1|f1(kotlin.Int){}[0]
+      @test/anno(x = "top level function")
+      public final fun f1(@test/anno(x = "top level function parameter") p: kotlin/Int): kotlin/Unit
+
+      // signature: test/f2|f2@kotlin.Long(kotlin.Int){}[0]
+      @test/anno(x = "extension function")
+      public final fun kotlin/Long.f2(@test/anno(x = "extension function parameter") p: kotlin/Int): kotlin/Unit
+
+      // signature: test/p1|{}p1[0]
+      @test/anno(x = "top level property")
+      public final val p1: kotlin/Nothing?
+        // signature: test/p1.<get-p1>|<get-p1>(){}[0]
+        public final get
+
+      // signature: test/p2|@kotlin.Double{}p2[0]
+      @test/anno(x = "extension property")
+      public final val kotlin/Double.p2: kotlin/Double
+        // signature: test/p2.<get-p2>|<get-p2>@kotlin.Double(){}[0]
+        public final /* non-default */ get
+    }
+  }
 }

native/native.tests/testData/klib/dump-metadata/builtinsSerializer/binaryRetainedAnnotation.fir.txt

@@ -0,0 +1,45 @@
+library {
+  // module name: <binaryRetainedAnnotation.kt>
+
+  library fragment {
+    // package name: test
+
+    // class name: test/A
+    // class name: test/Enum
+    // class name: test/Klass
+
+    @kotlin/annotation/Retention(value = kotlin/annotation/AnnotationRetention.BINARY)
+    @kotlin/annotation/Target(allowedTargets = [kotlin/annotation/AnnotationTarget.CLASS, kotlin/annotation/AnnotationTarget.CONSTRUCTOR, kotlin/annotation/AnnotationTarget.FUNCTION, kotlin/annotation/AnnotationTarget.PROPERTY, kotlin/annotation/AnnotationTarget.VALUE_PARAMETER, kotlin/annotation/AnnotationTarget.TYPE, kotlin/annotation/AnnotationTarget.TYPE_PARAMETER])
+    public final annotation class test/A : kotlin/Annotation {
+
+      public constructor()
+    }
+
+    public final enum class test/Enum : kotlin/Enum<test/Enum> {
+
+      private constructor()
+
+      @test/A
+      ENTRY,
+
+      // has Enum.entries
+    }
+
+    @test/A
+    public final class test/Klass : kotlin/Any {
+
+      @test/A
+      public constructor()
+    }
+
+    package {
+
+      @test/A
+      public final fun <@test/A T#0 /* T */> function(@test/A param: kotlin/Unit): @test/A kotlin/Unit
+
+      @test/A
+      public final val property: kotlin/Unit
+        public final get
+    }
+  }
+}