FIR: introduce & use various comparators to sort members while de/serialization

#KT-41018 fixed

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt

@@ -4,15 +4,15 @@
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor(): R|test/E|
-
-    public final static enum entry ENTRY: R|test/E|
-    public final static fun values(): R|kotlin/Array<test/E>| {
-    }
-
     public final static fun valueOf(value: R|kotlin/String|): R|test/E| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/E>| {
+    }
+
+    private constructor(): R|test/E|
+
+    public final static enum entry ENTRY: R|test/E|
 }
 
 public final annotation class EnumOption : R|kotlin/Annotation| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt

@@ -1,13 +1,13 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor(): R|test/E|
-
-    public final static enum entry CAKE: R|test/E|
-    public final static fun values(): R|kotlin/Array<test/E>| {
-    }
-
     public final static fun valueOf(value: R|kotlin/String|): R|test/E| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/E>| {
+    }
+
+    private constructor(): R|test/E|
+
+    public final static enum entry CAKE: R|test/E|
 }
 
 public final annotation class EnumAnno : R|kotlin/Annotation| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt

@@ -4,8 +4,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     public final companion object Companion : R|kotlin/Any| {
         @FIELD:R|test/Anno|() public final var property: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -15,4 +13,6 @@ public final class Class : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt

@@ -15,17 +15,17 @@ public final annotation class Bnno : R|kotlin/Annotation| {
 }
 
 public final enum class Eee : R|kotlin/Enum<test/Eee>| {
+    public final static fun valueOf(value: R|kotlin/String|): R|test/Eee| {
+    }
+
+    public final static fun values(): R|kotlin/Array<test/Eee>| {
+    }
+
     private constructor(): R|test/Eee|
 
     public final static enum entry Entry1: R|test/Eee|
     public final static enum entry Entry2: R|test/Eee|
     public final static enum entry Entry3: R|test/Eee|
     public final static enum entry Entry4: R|test/Eee|
-    public final static fun values(): R|kotlin/Array<test/Eee>| {
-    }
-
-    public final static fun valueOf(value: R|kotlin/String|): R|test/Eee| {
-    }
-
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -4,16 +4,16 @@ public final annotation class Ann : R|kotlin/Annotation| {
 }
 
 public sealed class Sealed : R|kotlin/Any| {
-    public final val z: R|test/Z|
-        public get(): R|test/Z|
-
-    @R|test/Ann|() private constructor(@R|test/Ann|() z: R|test/Z|): R|test/Sealed|
-
     public final class Derived : R|test/Sealed| {
         @R|test/Ann|() public constructor(z: R|test/Z|): R|test/Sealed.Derived|
 
     }
 
+    public final val z: R|test/Z|
+        public get(): R|test/Z|
+
+    @R|test/Ann|() private constructor(@R|test/Ann|() z: R|test/Z|): R|test/Sealed|
+
 }
 
 public final class Test : R|kotlin/Any| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt

@@ -1,26 +1,26 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|test/A.Companion|
-
         public final annotation class Anno1 : R|kotlin/Annotation| {
             public constructor(): R|test/A.Companion.Anno1|
 
         }
 
         public final class B : R|kotlin/Any| {
-            public constructor(): R|test/A.Companion.B|
-
             public final annotation class Anno2 : R|kotlin/Annotation| {
                 public constructor(): R|test/A.Companion.B.Anno2|
 
             }
 
+            public constructor(): R|test/A.Companion.B|
+
         }
 
+        private constructor(): R|test/A.Companion|
+
     }
 
+    public constructor(): R|test/A|
+
 }
 
 @R|test/A.Companion.Anno1|() @R|test/A.Companion.B.Anno2|() public final class C : R|kotlin/Any| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt

@@ -4,16 +4,16 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|test/Class.Companion|
-
         @R|test/Anno|() public final class Nested : R|kotlin/Any| {
             public constructor(): R|test/Class.Companion.Nested|
 
         }
 
+        private constructor(): R|test/Class.Companion|
+
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt

@@ -4,11 +4,11 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     @R|test/Anno|() public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Class.Companion|
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt

@@ -1,9 +1,5 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final class B : R|kotlin/Any| {
-        public constructor(): R|test/A.B|
-
         public final companion object Companion : R|kotlin/Any| {
             public final val TEST: R|kotlin/Int|
                 public get(): R|kotlin/Int|
@@ -12,6 +8,10 @@ public final class A : R|kotlin/Any| {
 
         }
 
+        public constructor(): R|test/A.B|
+
     }
 
+    public constructor(): R|test/A|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt

@@ -1,6 +1,4 @@
 @R|kotlin/Deprecated|(message = String(Class)) public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     @R|kotlin/Deprecated|(message = String(companion object)) public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Class.Companion|
 
@@ -16,4 +14,6 @@
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt

@@ -7,8 +7,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 @R|test/Anno|(t = R|java/lang/annotation/ElementType.METHOD|()) public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     @R|test/Anno|(t = R|java/lang/annotation/ElementType.ANNOTATION_TYPE|()) public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Class.Companion|
 
@@ -24,4 +22,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt

@@ -1,11 +1,11 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final annotation class Anno : R|kotlin/Annotation| {
         public constructor(): R|test/A.Anno|
 
     }
 
+    public constructor(): R|test/A|
+
 }
 
 @R|test/A.Anno|() public final class B : R|kotlin/Any| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt

@@ -4,8 +4,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     @R|test/Anno|() public final inner class Inner : R|kotlin/Any| {
         public constructor(): R|test/Class.Inner|
 
@@ -16,4 +14,6 @@ public final class Class : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt

@@ -9,6 +9,12 @@ public final annotation class B : R|kotlin/Annotation| {
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
+    public final static fun valueOf(value: R|kotlin/String|): R|test/E| {
+    }
+
+    public final static fun values(): R|kotlin/Array<test/E>| {
+    }
+
     public final val x: R|kotlin/String|
         public get(): R|kotlin/String|
 
@@ -17,11 +23,5 @@ public final enum class E : R|kotlin/Enum<test/E>| {
 
     private constructor(@R|test/A|() x: R|kotlin/String|, @R|test/B|() y: R|kotlin/Int|): R|test/E|
 
-    public final static fun values(): R|kotlin/Array<test/E>| {
-    }
-
-    public final static fun valueOf(value: R|kotlin/String|): R|test/E| {
-    }
-
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt

@@ -7,8 +7,6 @@ public final annotation class A : R|kotlin/Annotation| {
 }
 
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final inner class Inner : R|kotlin/Any| {
         public final val y: R|kotlin/String|
             public get(): R|kotlin/String|
@@ -25,4 +23,6 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt

@@ -4,8 +4,6 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     public final companion object Companion : R|kotlin/Any| {
         @PROPERTY:R|test/Anno|() public final val property: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -14,4 +12,6 @@ public final class Class : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt

@@ -4,12 +4,12 @@ public final annotation class Anno : R|kotlin/Annotation| {
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(): R|test/Class|
-
     public abstract interface Trait : R|kotlin/Any| {
         public abstract val property: R|kotlin/Int|
             public get(): R|kotlin/Int|
 
     }
 
+    public constructor(): R|test/Class|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt

@@ -25,13 +25,13 @@ public final class Generic<T> : R|kotlin/Any| {
 }
 
 public final class InnerGeneric<A, B> : R|kotlin/Any| {
-    public constructor<A, B>(): R|test/InnerGeneric<A, B>|
-
     public final inner class Inner<in C, D : R|A|, A, B> : R|kotlin/Any| {
         public constructor<in C, D : R|A|>(): R|test/InnerGeneric.Inner<C, D, A, B>|
 
     }
 
+    public constructor<A, B>(): R|test/InnerGeneric<A, B>|
+
 }
 
 public final class Simple : R|kotlin/Any| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassInnerClass.txt

@@ -1,9 +1,9 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final inner class Inner : R|kotlin/Any| {
         public constructor(): R|test/Outer.Inner|
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/ClassMemberConflict.txt

@@ -1,9 +1,4 @@
 public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any| {
-    public final val some: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
-    public constructor<test>(): R|test/ConstructorTypeParamClassObjectConflict<test>|
-
     public final companion object Companion : R|kotlin/Any| {
         public final val test: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -12,33 +7,30 @@ public final class ConstructorTypeParamClassObjectConflict<test> : R|kotlin/Any|
 
     }
 
+    public final val some: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public constructor<test>(): R|test/ConstructorTypeParamClassObjectConflict<test>|
+
 }
 
 public final class ConstructorTypeParamClassObjectTypeConflict<test> : R|kotlin/Any| {
+    public final companion object Companion : R|kotlin/Any| {
+        public abstract interface test : R|kotlin/Any| {
+        }
+
+        private constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict.Companion|
+
+    }
+
     public final val some: R|test?|
         public get(): R|test?|
 
     public constructor<test>(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
 
-    public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict.Companion|
-
-        public abstract interface test : R|kotlin/Any| {
-        }
-
-    }
-
 }
 
 public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
-    public final val bla: R|kotlin/String|
-        public get(): R|kotlin/String|
-
-    public final val some: R|kotlin/String|
-        public get(): R|kotlin/String|
-
-    public constructor(): R|test/TestClassObjectAndClassConflict|
-
     public final companion object Companion : R|kotlin/Any| {
         public final val bla: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -47,14 +39,17 @@ public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
 
     }
 
-}
+    public final val bla: R|kotlin/String|
+        public get(): R|kotlin/String|
 
-public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
     public final val some: R|kotlin/String|
         public get(): R|kotlin/String|
 
-    public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
+    public constructor(): R|test/TestClassObjectAndClassConflict|
 
+}
+
+public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final val test: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -63,17 +58,14 @@ public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
 
     }
 
-}
-
-public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
     public final val some: R|kotlin/String|
         public get(): R|kotlin/String|
 
-    public final val test: R|kotlin/String|
-        public get(): R|kotlin/String|
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
 
-    public constructor(test: R|kotlin/String|): R|test/TestConstructorValClassObjectConflict|
+}
 
+public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final val test: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -82,4 +74,13 @@ public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
 
     }
 
+    public final val some: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public final val test: R|kotlin/String|
+        public get(): R|kotlin/String|
+
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorValClassObjectConflict|
+
 }
+

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt

@@ -1,11 +1,11 @@
 public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test/EnumWithGenericConstructorParameter>| {
-    private constructor(list: R|kotlin/collections/List<kotlin/String>?|): R|test/EnumWithGenericConstructorParameter|
+    public final static fun valueOf(value: R|kotlin/String|): R|test/EnumWithGenericConstructorParameter| {
+    }
 
     public final static fun values(): R|kotlin/Array<test/EnumWithGenericConstructorParameter>| {
     }
 
-    public final static fun valueOf(value: R|kotlin/String|): R|test/EnumWithGenericConstructorParameter| {
-    }
+    private constructor(list: R|kotlin/collections/List<kotlin/String>?|): R|test/EnumWithGenericConstructorParameter|
 
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt

@@ -1,11 +1,11 @@
 public final enum class EnumWithPrimitiveConstructorParameter : R|kotlin/Enum<test/EnumWithPrimitiveConstructorParameter>| {
-    private constructor(b: R|kotlin/Boolean|): R|test/EnumWithPrimitiveConstructorParameter|
+    public final static fun valueOf(value: R|kotlin/String|): R|test/EnumWithPrimitiveConstructorParameter| {
+    }
 
     public final static fun values(): R|kotlin/Array<test/EnumWithPrimitiveConstructorParameter>| {
     }
 
-    public final static fun valueOf(value: R|kotlin/String|): R|test/EnumWithPrimitiveConstructorParameter| {
-    }
+    private constructor(b: R|kotlin/Boolean|): R|test/EnumWithPrimitiveConstructorParameter|
 
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt

@@ -1,6 +1,4 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public open inner class Inner1 : R|kotlin/Any| {
         public constructor(): R|test/Outer.Inner1|
 
@@ -11,4 +9,6 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerGenericClass.txt

@@ -1,9 +1,9 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final inner class Inner<T> : R|kotlin/Any| {
         public constructor<T>(): R|test/Outer.Inner<T>|
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/InnerTypes.txt

@@ -1,11 +1,5 @@
 public final class Outer<E, F> : R|kotlin/Any| {
-    public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
-
-    public constructor<E, F>(): R|test/Outer<E, F>|
-
     public final inner class Inner<G, H, E, F> : R|kotlin/Any| {
-        public constructor<G, H>(): R|test/Outer.Inner<G, H, E, F>|
-
         public final inner class Inner3<I, G, H, E, F> : R|kotlin/Any| {
             public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
 
@@ -13,6 +7,8 @@ public final class Outer<E, F> : R|kotlin/Any| {
 
         }
 
+        public constructor<G, H>(): R|test/Outer.Inner<G, H, E, F>|
+
     }
 
     public final inner class Inner2<E, F> : R|kotlin/Any| {
@@ -20,5 +16,9 @@ public final class Outer<E, F> : R|kotlin/Any| {
 
     }
 
+    public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
+
+    public constructor<E, F>(): R|test/Outer<E, F>|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClass.txt

@@ -1,6 +1,4 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
@@ -11,4 +9,6 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt

@@ -1,9 +1,5 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|test/Outer.Companion|
-
         public final object Obj : R|kotlin/Any| {
             public final fun f(): R|kotlin/String|
 
@@ -14,6 +10,10 @@ public final class Outer : R|kotlin/Any| {
 
         }
 
+        private constructor(): R|test/Outer.Companion|
+
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt

@@ -1,6 +1,4 @@
 public final object Outer : R|kotlin/Any| {
-    private constructor(): R|test/Outer|
-
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
@@ -11,4 +9,6 @@ public final object Outer : R|kotlin/Any| {
 
     }
 
+    private constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClass.txt

@@ -1,9 +1,9 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final class Nested : R|kotlin/Any| {
         public constructor(): R|test/Outer.Nested|
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt

@@ -1,6 +1,4 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public open class Nested1 : R|kotlin/Any| {
         public constructor(): R|test/Outer.Nested1|
 
@@ -11,4 +9,6 @@ public final class Outer : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/NestedGenericClass.txt

@@ -1,9 +1,9 @@
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final class Nested<T> : R|kotlin/Any| {
         public constructor<T>(): R|test/Outer.Nested<T>|
 
     }
 
+    public constructor(): R|test/Outer|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/class/SealedClass.txt

@@ -9,12 +9,12 @@ public final class Inheritor3 : R|test/SealedClass| {
 }
 
 public sealed class SealedClass : R|kotlin/Any| {
-    private constructor(): R|test/SealedClass|
-
     public final class Inheritor1 : R|test/SealedClass| {
         public constructor(): R|test/SealedClass.Inheritor1|
 
     }
 
+    private constructor(): R|test/SealedClass|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt

@@ -1,6 +1,4 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
-    public constructor(): R|test/ClassObjectDeclaresProperty|
-
     public final companion object Companion : R|kotlin/Any| {
         public final val i: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -9,4 +7,6 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/ClassObjectDeclaresProperty|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt

@@ -1,6 +1,4 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
-    public constructor(): R|test/ClassObjectDeclaresProperty|
-
     public final companion object Companion : R|kotlin/Any| {
         public final var s: R|kotlin/String|
             public get(): R|kotlin/String|
@@ -10,4 +8,6 @@ public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/ClassObjectDeclaresProperty|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt

@@ -1,75 +1,75 @@
 public final class Int : R|kotlin/Any| {
-    public constructor(): R|test/Int|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Int.Companion|
 
     }
 
+    public constructor(): R|test/Int|
+
 }
 
 public final class Outer : R|kotlin/Any| {
-    public constructor(): R|test/Outer|
-
     public final class Int : R|kotlin/Any| {
-        public constructor(): R|test/Outer.Int|
-
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Int.Companion|
 
         }
 
+        public constructor(): R|test/Outer.Int|
+
     }
 
     private final class Pri : R|kotlin/Any| {
-        public constructor(): R|test/Outer.Pri|
-
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Pri.Companion|
 
         }
 
+        public constructor(): R|test/Outer.Pri|
+
     }
 
     protected final class Pro : R|kotlin/Any| {
-        public constructor(): R|test/Outer.Pro|
-
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Pro.Companion|
 
         }
 
+        public constructor(): R|test/Outer.Pro|
+
     }
 
     public final class Pub : R|kotlin/Any| {
-        public constructor(): R|test/Outer.Pub|
-
         public final companion object Companion : R|kotlin/Any| {
             private constructor(): R|test/Outer.Pub.Companion|
 
         }
 
+        public constructor(): R|test/Outer.Pub|
+
     }
 
+    public constructor(): R|test/Outer|
+
 }
 
 private final class Pri : R|kotlin/Any| {
-    public constructor(): R|test/Pri|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Pri.Companion|
 
     }
 
+    public constructor(): R|test/Pri|
+
 }
 
 public final class Pub : R|kotlin/Any| {
-    public constructor(): R|test/Pub|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/Pub.Companion|
 
     }
 
+    public constructor(): R|test/Pub|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt

@@ -1,90 +1,90 @@
 internal final class IntInt : R|kotlin/Any| {
-    public constructor(): R|test/IntInt|
-
     internal final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/IntInt.Companion|
 
     }
 
+    public constructor(): R|test/IntInt|
+
 }
 
 internal final class IntPri : R|kotlin/Any| {
-    public constructor(): R|test/IntPri|
-
     private final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/IntPri.Companion|
 
     }
 
+    public constructor(): R|test/IntPri|
+
 }
 
 internal final class IntPub : R|kotlin/Any| {
-    public constructor(): R|test/IntPub|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/IntPub.Companion|
 
     }
 
+    public constructor(): R|test/IntPub|
+
 }
 
 private final class PriInt : R|kotlin/Any| {
-    public constructor(): R|test/PriInt|
-
     internal final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PriInt.Companion|
 
     }
 
+    public constructor(): R|test/PriInt|
+
 }
 
 private final class PriPri : R|kotlin/Any| {
-    public constructor(): R|test/PriPri|
-
     private final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PriPri.Companion|
 
     }
 
+    public constructor(): R|test/PriPri|
+
 }
 
 private final class PriPub : R|kotlin/Any| {
-    public constructor(): R|test/PriPub|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PriPub.Companion|
 
     }
 
+    public constructor(): R|test/PriPub|
+
 }
 
 public final class PubInt : R|kotlin/Any| {
-    public constructor(): R|test/PubInt|
-
     internal final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PubInt.Companion|
 
     }
 
+    public constructor(): R|test/PubInt|
+
 }
 
 public final class PubPri : R|kotlin/Any| {
-    public constructor(): R|test/PubPri|
-
     private final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PubPri.Companion|
 
     }
 
+    public constructor(): R|test/PubPri|
+
 }
 
 public final class PubPub : R|kotlin/Any| {
-    public constructor(): R|test/PubPub|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/PubPub.Companion|
 
     }
 
+    public constructor(): R|test/PubPub|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt

@@ -2,11 +2,11 @@ public abstract interface Bbb : R|kotlin/Any| {
 }
 
 public final class ClassObjectextendsTrait : R|kotlin/Any| {
-    public constructor(): R|test/ClassObjectextendsTrait|
-
     public final companion object Companion : R|test/Bbb| {
         private constructor(): R|test/ClassObjectextendsTrait.Companion|
 
     }
 
+    public constructor(): R|test/ClassObjectextendsTrait|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt

@@ -2,11 +2,11 @@ public abstract interface Bbb<P> : R|kotlin/Any| {
 }
 
 public final class ClassObjectExtendsTraitWithTP : R|kotlin/Any| {
-    public constructor(): R|test/ClassObjectExtendsTraitWithTP|
-
     public final companion object Companion : R|test/Bbb<kotlin/String>| {
         private constructor(): R|test/ClassObjectExtendsTraitWithTP.Companion|
 
     }
 
+    public constructor(): R|test/ClassObjectExtendsTraitWithTP|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt

@@ -1,6 +1,4 @@
 public final class Test : R|kotlin/Any| {
-    public constructor(): R|test/Test|
-
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
@@ -33,4 +31,6 @@ public final class Test : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/Test|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt

@@ -1,9 +1,4 @@
 public final class A : R|kotlin/Any| {
-    public final val other: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
-    public constructor(): R|test/A|
-
     public final companion object Companion : R|kotlin/Any| {
         public final val some: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -12,4 +7,9 @@ public final class A : R|kotlin/Any| {
 
     }
 
+    public final val other: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public constructor(): R|test/A|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/Delegation.txt

@@ -1,8 +1,4 @@
 public final class A : R|test/T| {
-    public open fun foo(): R|kotlin/Int|
-
-    public constructor(): R|test/A|
-
     public final companion object Companion : R|test/T| {
         public open fun foo(): R|kotlin/Int|
 
@@ -10,6 +6,10 @@ public final class A : R|test/T| {
 
     }
 
+    public open fun foo(): R|kotlin/Int|
+
+    public constructor(): R|test/A|
+
 }
 
 public abstract interface T : R|kotlin/Any| {

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt

@@ -1,6 +1,4 @@
 public final class TestFirst : R|kotlin/Any| {
-    public constructor(): R|test/TestFirst|
-
     public final companion object Companion : R|kotlin/Any| {
         public final fun testing(a: R|test/TestFirst.InnerClass|): R|kotlin/Int|
 
@@ -20,4 +18,6 @@ public final class TestFirst : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/TestFirst|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/NamedClassObject.txt

@@ -1,6 +1,4 @@
 public final class NamedClassObject : R|kotlin/Any| {
-    public constructor(): R|test/NamedClassObject|
-
     public final companion object Named : R|kotlin/Any| {
         public final fun f(): R|kotlin/Int|
 
@@ -8,4 +6,6 @@ public final class NamedClassObject : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/NamedClassObject|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt

@@ -1,9 +1,9 @@
 public final class SimpleClassObject : R|kotlin/Any| {
-    public constructor(): R|test/SimpleClassObject|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/SimpleClassObject.Companion|
 
     }
 
+    public constructor(): R|test/SimpleClassObject|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt

@@ -1,9 +1,9 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final class TestConstructor : R|kotlin/Any| {
         public constructor(p: R|kotlin/Int| = STUB): R|test/A.TestConstructor|
 
     }
 
+    public constructor(): R|test/A|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumVisibility.txt

@@ -1,36 +1,36 @@
 internal final enum class In : R|kotlin/Enum<test/In>| {
-    private constructor(): R|test/In|
-
-    public final static enum entry A: R|test/In|
-    public final static fun values(): R|kotlin/Array<test/In>| {
-    }
-
     public final static fun valueOf(value: R|kotlin/String|): R|test/In| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/In>| {
+    }
+
+    private constructor(): R|test/In|
+
+    public final static enum entry A: R|test/In|
 }
 
 private final enum class Pr : R|kotlin/Enum<test/Pr>| {
-    private constructor(): R|test/Pr|
-
-    public final static enum entry A: R|test/Pr|
-    public final static fun values(): R|kotlin/Array<test/Pr>| {
-    }
-
     public final static fun valueOf(value: R|kotlin/String|): R|test/Pr| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/Pr>| {
+    }
+
+    private constructor(): R|test/Pr|
+
+    public final static enum entry A: R|test/Pr|
 }
 
 public final enum class Pu : R|kotlin/Enum<test/Pu>| {
-    private constructor(): R|test/Pu|
-
-    public final static enum entry A: R|test/Pu|
-    public final static fun values(): R|kotlin/Array<test/Pu>| {
-    }
-
     public final static fun valueOf(value: R|kotlin/String|): R|test/Pu| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/Pu>| {
+    }
+
+    private constructor(): R|test/Pu|
+
+    public final static enum entry A: R|test/Pu|
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt

@@ -1,4 +1,10 @@
 public final enum class En : R|kotlin/Enum<test/En>| {
+    public final static fun valueOf(value: R|kotlin/String|): R|test/En| {
+    }
+
+    public final static fun values(): R|kotlin/Array<test/En>| {
+    }
+
     public final val b: R|kotlin/Boolean|
         public get(): R|kotlin/Boolean|
 
@@ -10,11 +16,5 @@ public final enum class En : R|kotlin/Enum<test/En>| {
     public final static enum entry E1: R|test/En|
     public final static enum entry E2: R|test/En|
     public final static enum entry E3: R|test/En|
-    public final static fun values(): R|kotlin/Array<test/En>| {
-    }
-
-    public final static fun valueOf(value: R|kotlin/String|): R|test/En| {
-    }
-
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt

@@ -1,11 +1,4 @@
 public final enum class Enum : R|kotlin/Enum<test/Enum>| {
-    public final fun f(): R|kotlin/Int|
-
-    public final val c: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
-    private constructor(): R|test/Enum|
-
     public final inner class Inner : R|kotlin/Any| {
         public constructor(): R|test/Enum.Inner|
 
@@ -19,13 +12,20 @@ public final enum class Enum : R|kotlin/Enum<test/Enum>| {
     public abstract interface Trait : R|kotlin/Any| {
     }
 
-    public final static enum entry ENTRY1: R|test/Enum|
-    public final static enum entry ENTRY2: R|test/Enum|
-    public final static fun values(): R|kotlin/Array<test/Enum>| {
-    }
+    public final fun f(): R|kotlin/Int|
 
     public final static fun valueOf(value: R|kotlin/String|): R|test/Enum| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/Enum>| {
+    }
+
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    private constructor(): R|test/Enum|
+
+    public final static enum entry ENTRY1: R|test/Enum|
+    public final static enum entry ENTRY2: R|test/Enum|
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnum.txt

@@ -1,17 +1,17 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final enum class E : R|kotlin/Enum<test/A.E>| {
-        private constructor(): R|test/A.E|
-
-        public final static enum entry ENTRY: R|test/A.E|
-        public final static fun values(): R|kotlin/Array<test/A.E>| {
-        }
-
         public final static fun valueOf(value: R|kotlin/String|): R|test/A.E| {
         }
 
+        public final static fun values(): R|kotlin/Array<test/A.E>| {
+        }
+
+        private constructor(): R|test/A.E|
+
+        public final static enum entry ENTRY: R|test/A.E|
     }
 
+    public constructor(): R|test/A|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt

@@ -1,22 +1,22 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final companion object Companion : R|kotlin/Any| {
         private constructor(): R|test/A.Companion|
 
     }
 
     public final enum class E : R|kotlin/Enum<test/A.E>| {
-        private constructor(): R|test/A.E|
-
-        public final static enum entry ENTRY: R|test/A.E|
-        public final static fun values(): R|kotlin/Array<test/A.E>| {
-        }
-
         public final static fun valueOf(value: R|kotlin/String|): R|test/A.E| {
         }
 
+        public final static fun values(): R|kotlin/Array<test/A.E>| {
+        }
+
+        private constructor(): R|test/A.E|
+
+        public final static enum entry ENTRY: R|test/A.E|
     }
 
+    public constructor(): R|test/A|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/enum/SimpleEnum.txt

@@ -1,12 +1,12 @@
 public final enum class MyEnum : R|kotlin/Enum<test/MyEnum>| {
-    private constructor(): R|test/MyEnum|
-
-    public final static enum entry ENTRY: R|test/MyEnum|
-    public final static fun values(): R|kotlin/Array<test/MyEnum>| {
-    }
-
     public final static fun valueOf(value: R|kotlin/String|): R|test/MyEnum| {
     }
 
+    public final static fun values(): R|kotlin/Array<test/MyEnum>| {
+    }
+
+    private constructor(): R|test/MyEnum|
+
+    public final static enum entry ENTRY: R|test/MyEnum|
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt

@@ -1,14 +1,14 @@
 public final class Some : R|kotlin/Any| {
-    public constructor(): R|test/Some|
-
     public final companion object Companion : R|kotlin/Any| {
-        private constructor(): R|test/Some.Companion|
-
         public final annotation class TestAnnotation : R|kotlin/Annotation| {
             public constructor(): R|test/Some.Companion.TestAnnotation|
 
         }
 
+        private constructor(): R|test/Some.Companion|
+
     }
 
+    public constructor(): R|test/Some|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/Enum.txt

@@ -1,13 +1,13 @@
 public final enum class Test : R|kotlin/Enum<test/Test>| {
+    public final static fun valueOf(value: R|kotlin/String|): R|test/Test| {
+    }
+
+    public final static fun values(): R|kotlin/Array<test/Test>| {
+    }
+
     private constructor(a: R|kotlin/Int|): R|test/Test|
 
     public final static enum entry A: R|test/Test|
     public final static enum entry B: R|test/Test|
-    public final static fun values(): R|kotlin/Array<test/Test>| {
-    }
-
-    public final static fun valueOf(value: R|kotlin/String|): R|test/Test| {
-    }
-
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt

@@ -1,6 +1,4 @@
 public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
-    public constructor(): R|test/InheritMethodsDifferentReturnTypes|
-
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
     }
 
@@ -18,4 +16,6 @@ public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/InheritMethodsDifferentReturnTypes|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt

@@ -1,6 +1,4 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
-    public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
-
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String, kotlin/CharSequence>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence, kotlin/String>| {
     }
 
@@ -18,4 +16,6 @@ public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt

@@ -1,9 +1,9 @@
 public open class InnerClass : R|kotlin/Any| {
-    public constructor(): R|test/InnerClass|
-
     public open inner class Inner : R|kotlin/Any| {
         public constructor(): R|test/InnerClass.Inner|
 
     }
 
+    public constructor(): R|test/InnerClass|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt

@@ -1,9 +1,9 @@
 public open class NestedClass : R|kotlin/Any| {
-    public constructor(): R|test/NestedClass|
-
     public open class Nested : R|kotlin/Any| {
         public constructor(): R|test/NestedClass.Nested|
 
     }
 
+    public constructor(): R|test/NestedClass|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt

@@ -1,6 +1,4 @@
 public final class A : R|kotlin/Any| {
-    public constructor(): R|test/A|
-
     public final object B : R|kotlin/Any| {
         public final fun foo(a: R|kotlin/Int|): R|kotlin/String|
 
@@ -8,4 +6,6 @@ public final class A : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/A|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt

@@ -1,9 +1,10 @@
 public final class UnboundWildcard : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
+    }
+
     public final fun foo(): R|test/UnboundWildcard.MyClass<*>?|
 
     public constructor(): R|test/UnboundWildcard|
 
-    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
-    }
-
 }
+

compiler/fir/analysis-tests/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt

@@ -1,9 +1,10 @@
 public final class StarProjection : R|kotlin/Any| {
+    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
+    }
+
     public final fun foo(): R|test/StarProjection.MyClass<*>|
 
     public constructor(): R|test/StarProjection|
 
-    public abstract interface MyClass<T : R|kotlin/CharSequence?|> : R|kotlin/Any| {
-    }
-
 }
+

compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt

@@ -1,4 +1,10 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
+    public final static fun valueOf(value: R|kotlin/String|): R|test/E| {
+    }
+
+    public final static fun values(): R|kotlin/Array<test/E>| {
+    }
+
     private constructor(): R|test/E|
 
     public final static enum entry ONE: R|test/E|
@@ -9,11 +15,5 @@ public final enum class E : R|kotlin/Enum<test/E>| {
     public final static enum entry SIX: R|test/E|
     public final static enum entry SEVEN: R|test/E|
     public final static enum entry EIGHT: R|test/E|
-    public final static fun values(): R|kotlin/Array<test/E>| {
-    }
-
-    public final static fun valueOf(value: R|kotlin/String|): R|test/E| {
-    }
-
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt

@@ -1,18 +1,18 @@
 public final class A : R|kotlin/Any| {
     public final fun f1(): R|kotlin/Unit|
 
-    public final fun f2(): R|kotlin/Unit|
-
-    public final fun f3(): R|kotlin/Unit|
-
     public final fun R|kotlin/Int|.f1(): R|kotlin/Unit|
 
     public final fun R|kotlin/String|.f1(): R|kotlin/Unit|
 
+    public final fun f2(): R|kotlin/Unit|
+
     public final fun R|kotlin/Int|.f2(): R|kotlin/Unit|
 
     public final fun R|kotlin/String|.f2(): R|kotlin/Unit|
 
+    public final fun f3(): R|kotlin/Unit|
+
     public final fun R|kotlin/Int|.f3(): R|kotlin/Unit|
 
     public final fun R|kotlin/String|.f3(): R|kotlin/Unit|
@@ -20,10 +20,10 @@ public final class A : R|kotlin/Any| {
     public final val c: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final val d: R|kotlin/Int|
+    public final val R|kotlin/Int|.c: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final val R|kotlin/Int|.c: R|kotlin/Int|
+    public final val d: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
     public final val R|kotlin/Int|.d: R|kotlin/Int|

compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt

@@ -2,15 +2,15 @@ public final class A : R|kotlin/Any| {
     public final val a: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
-    public final val c: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
     public final val R|kotlin/Int|.a: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
     public final val R|kotlin/Int|.b: R|kotlin/Int|
         public get(): R|kotlin/Int|
 
+    public final val c: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
     public final val R|kotlin/Int|.c: R|kotlin/Int|
         public get(): R|kotlin/Int|
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt

@@ -1,6 +1,4 @@
 public final class O : R|kotlin/Any| {
-    public constructor(): R|test/O|
-
     public final class A1 : R|kotlin/Any| {
         public constructor(): R|test/O.A1|
 
@@ -27,4 +25,6 @@ public final class O : R|kotlin/Any| {
     public abstract interface C2 : R|kotlin/Any| {
     }
 
+    public constructor(): R|test/O|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt

@@ -1,12 +1,6 @@
 public final class A<TA> : R|kotlin/Any| {
-    public constructor<TA>(): R|test/A<TA>|
-
     public final inner class B<TB, TA> : R|kotlin/Any| {
-        public constructor<TB>(): R|test/A.B<TB, TA>|
-
         public final inner class C<TC, TB, TA> : R|kotlin/Any| {
-            public constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
-
             public final inner class D<TD, TC, TB, TA> : R|kotlin/Any| {
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
 
@@ -16,8 +10,14 @@ public final class A<TA> : R|kotlin/Any| {
 
             }
 
+            public constructor<TC>(): R|test/A.B.C<TC, TB, TA>|
+
         }
 
+        public constructor<TB>(): R|test/A.B<TB, TA>|
+
     }
 
+    public constructor<TA>(): R|test/A<TA>|
+
 }

compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt

@@ -1,10 +1,10 @@
 public final class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
-    public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
-
     public final inner class Inner<Q : R|P|, P> : R|kotlin/Any| {
         public constructor<Q : R|P|>(): R|test/InnerClassReferencesOuterTP.Inner<Q, P>|
 
     }
 
+    public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt

@@ -1,6 +1,4 @@
 public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
-    public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
-
     public final inner class Inner<P> : R|kotlin/Any| {
         public final fun <Q : R|P|> f(): R|kotlin/Unit|
 
@@ -16,5 +14,7 @@ public final class MembersReferenceOuterTP<P> : R|kotlin/Any| {
 
     }
 
+    public constructor<P>(): R|test/MembersReferenceOuterTP<P>|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/Const.txt

@@ -10,8 +10,6 @@ public final object A : R|kotlin/Any| {
 }
 
 public final class B : R|kotlin/Any| {
-    public constructor(): R|test/B|
-
     public final companion object Companion : R|kotlin/Any| {
         public final const val inCompanion: R|kotlin/Int| = Int(3)
             public get(): R|kotlin/Int|
@@ -20,5 +18,7 @@ public final class B : R|kotlin/Any| {
 
     }
 
+    public constructor(): R|test/B|
+
 }
 

compiler/fir/analysis-tests/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt

@@ -2,11 +2,6 @@ public final val nonConstVal1: R|kotlin/Int|
     public get(): R|kotlin/Int|
 
 public final class C : R|kotlin/Any| {
-    public final val nonConstVal2: R|kotlin/Int|
-        public get(): R|kotlin/Int|
-
-    public constructor(): R|test/C|
-
     public final companion object Companion : R|kotlin/Any| {
         public final val nonConstVal3: R|kotlin/Int|
             public get(): R|kotlin/Int|
@@ -15,6 +10,11 @@ public final class C : R|kotlin/Any| {
 
     }
 
+    public final val nonConstVal2: R|kotlin/Int|
+        public get(): R|kotlin/Int|
+
+    public constructor(): R|test/C|
+
 }
 
 public abstract interface I : R|kotlin/Any| {