FIR: add class type parameters to constructors & change their rendering

compiler/fir/resolve/testData/builtIns/kotlin-collections.txt

@@ -3,7 +3,7 @@ public abstract class BooleanIterator : R|kotlin/collections/Iterator<kotlin/Boo
 
     public abstract fun nextBoolean(): R|kotlin/Boolean|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/BooleanIterator|
 
 }
 
@@ -12,7 +12,7 @@ public abstract class ByteIterator : R|kotlin/collections/Iterator<kotlin/Byte>|
 
     public abstract fun nextByte(): R|kotlin/Byte|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/ByteIterator|
 
 }
 
@@ -21,7 +21,7 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
 
     public abstract fun nextChar(): R|kotlin/Char|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/CharIterator|
 
 }
 
@@ -41,7 +41,7 @@ public abstract class DoubleIterator : R|kotlin/collections/Iterator<kotlin/Doub
 
     public abstract fun nextDouble(): R|kotlin/Double|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/DoubleIterator|
 
 }
 
@@ -50,7 +50,7 @@ public abstract class FloatIterator : R|kotlin/collections/Iterator<kotlin/Float
 
     public abstract fun nextFloat(): R|kotlin/Float|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/FloatIterator|
 
 }
 
@@ -59,7 +59,7 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
 
     public abstract fun nextInt(): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/IntIterator|
 
 }
 
@@ -118,7 +118,7 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
     public abstract fun nextLong(): R|kotlin/Long|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/LongIterator|
 
 }
 
@@ -258,7 +258,6 @@ public abstract class ShortIterator : R|kotlin/collections/Iterator<kotlin/Short
 
     public abstract fun nextShort(): R|kotlin/Short|
 
-    public constructor()
+    public constructor(): R|kotlin/collections/ShortIterator|
 
 }
-

compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt

@@ -9,12 +9,12 @@ public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>|
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|)
+    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Char|, rangeEnd: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/CharProgression.Companion|
 
     }
 
@@ -25,7 +25,7 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 
     public open fun nextChar(): R|kotlin/Char|
 
-    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|)
+    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgressionIterator|
 
 }
 
@@ -40,10 +40,10 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|)
+    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|): R|kotlin/ranges/CharRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/CharRange.Companion|
 
     }
 
@@ -67,12 +67,12 @@ public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|)
+    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Int|, rangeEnd: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/IntProgression.Companion|
 
     }
 
@@ -83,7 +83,7 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 
     public open fun nextInt(): R|kotlin/Int|
 
-    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|)
+    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgressionIterator|
 
 }
 
@@ -98,10 +98,10 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|)
+    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|): R|kotlin/ranges/IntRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/IntRange.Companion|
 
     }
 
@@ -118,12 +118,12 @@ public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>|
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|)
+    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Long|, rangeEnd: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
-        private constructor()
+        private constructor(): R|kotlin/ranges/LongProgression.Companion|
 
     }
 
@@ -134,7 +134,7 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 
     public open fun nextLong(): R|kotlin/Long|
 
-    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|)
+    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgressionIterator|
 
 }
 
@@ -149,12 +149,11 @@ public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|)
+    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|): R|kotlin/ranges/LongRange|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/ranges/LongRange.Companion|
 
     }
 
 }
-

compiler/fir/resolve/testData/builtIns/kotlin.txt

@@ -38,7 +38,7 @@ public open class Any {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|kotlin/Any|
 
 }
 
@@ -49,7 +49,7 @@ public open class Any {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|T|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|): R|kotlin/Array<T>|
 
 }
 
@@ -64,10 +64,10 @@ public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>| {
 
     public final infix fun xor(other: R|kotlin/Boolean|): R|kotlin/Boolean|
 
-    private constructor()
+    private constructor(): R|kotlin/Boolean|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Boolean.Companion|
 
     }
 
@@ -80,9 +80,9 @@ public final class BooleanArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Boolean|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|): R|kotlin/BooleanArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/BooleanArray|
 
 }
 
@@ -201,10 +201,10 @@ public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>| {
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Byte|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Byte.Companion|
 
     }
 
@@ -217,9 +217,9 @@ public final class ByteArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Byte|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|): R|kotlin/ByteArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/ByteArray|
 
 }
 
@@ -252,10 +252,10 @@ public final class Char : R|kotlin/Comparable<kotlin/Char>| {
 
     public final fun toShort(): R|kotlin/Short|
 
-    private constructor()
+    private constructor(): R|kotlin/Char|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Char.Companion|
 
     }
 
@@ -268,9 +268,9 @@ public final class CharArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Char|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|): R|kotlin/CharArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/CharArray|
 
 }
 
@@ -292,12 +292,12 @@ public abstract interface Cloneable : R|kotlin/Any| {
 }
 
 public final annotation class Deprecated : R|kotlin/Annotation| {
-    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|)
+    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|): R|kotlin/Deprecated|
 
 }
 
 public final enum class DeprecationLevel : R|kotlin/Enum<kotlin/DeprecationLevel>| {
-    private constructor()
+    private constructor(): R|kotlin/DeprecationLevel|
 
 }
 
@@ -408,10 +408,10 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>
 
     public final operator fun unaryPlus(): R|kotlin/Double|
 
-    private constructor()
+    private constructor(): R|kotlin/Double|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Double.Companion|
 
     }
 
@@ -424,14 +424,14 @@ public final class DoubleArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Double|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|): R|kotlin/DoubleArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/DoubleArray|
 
 }
 
 public final annotation class DslMarker : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/DslMarker|
 
 }
 
@@ -446,17 +446,17 @@ public final annotation class DslMarker : R|kotlin/Annotation| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|)
+    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|): R|kotlin/Enum<E>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Enum.Companion|
 
     }
 
 }
 
 public final annotation class ExtensionFunctionType : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/ExtensionFunctionType|
 
 }
 
@@ -567,10 +567,10 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|
 
     public final operator fun unaryPlus(): R|kotlin/Float|
 
-    private constructor()
+    private constructor(): R|kotlin/Float|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Float.Companion|
 
     }
 
@@ -583,9 +583,9 @@ public final class FloatArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Float|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|): R|kotlin/FloatArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/FloatArray|
 
 }
 
@@ -721,10 +721,10 @@ public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {
 
     public final infix fun xor(other: R|kotlin/Int|): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Int|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Int.Companion|
 
     }
 
@@ -737,9 +737,9 @@ public final class IntArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Int|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|): R|kotlin/IntArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/IntArray|
 
 }
 
@@ -872,10 +872,10 @@ public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>| {
 
     public final infix fun xor(other: R|kotlin/Long|): R|kotlin/Long|
 
-    private constructor()
+    private constructor(): R|kotlin/Long|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Long.Companion|
 
     }
 
@@ -888,14 +888,14 @@ public final class LongArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Long|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|): R|kotlin/LongArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/LongArray|
 
 }
 
 public final class Nothing {
-    private constructor()
+    private constructor(): R|kotlin/Nothing|
 
 }
 
@@ -914,22 +914,22 @@ public abstract class Number : R|kotlin/Any| {
 
     public abstract fun toShort(): R|kotlin/Short|
 
-    public constructor()
+    public constructor(): R|kotlin/Number|
 
 }
 
 public final annotation class ParameterName : R|kotlin/Annotation| {
-    public constructor(name: R|kotlin/String|)
+    public constructor(name: R|kotlin/String|): R|kotlin/ParameterName|
 
 }
 
 public final annotation class PublishedApi : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/PublishedApi|
 
 }
 
 public final annotation class ReplaceWith : R|kotlin/Annotation| {
-    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|)
+    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|): R|kotlin/ReplaceWith|
 
 }
 
@@ -1048,10 +1048,10 @@ public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
-    private constructor()
+    private constructor(): R|kotlin/Short|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/Short.Companion|
 
     }
 
@@ -1064,14 +1064,14 @@ public final class ShortArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Short|): R|kotlin/Unit|
 
-    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|)
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|): R|kotlin/ShortArray|
 
-    public constructor(size: R|kotlin/Int|)
+    public constructor(size: R|kotlin/Int|): R|kotlin/ShortArray|
 
 }
 
 public final annotation class SinceKotlin : R|kotlin/Annotation| {
-    public constructor(version: R|kotlin/String|)
+    public constructor(version: R|kotlin/String|): R|kotlin/SinceKotlin|
 
 }
 
@@ -1084,40 +1084,39 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
-    public constructor()
+    public constructor(): R|kotlin/String|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|kotlin/String.Companion|
 
     }
 
 }
 
 public final annotation class Suppress : R|kotlin/Annotation| {
-    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|): R|kotlin/Suppress|
 
 }
 
 public open class Throwable : R|kotlin/Any| {
-    public constructor(message: R|kotlin/String|?)
+    public constructor(message: R|kotlin/String|?): R|kotlin/Throwable|
 
-    public constructor(cause: R|kotlin/Throwable|?)
+    public constructor(cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
 
-    public constructor()
+    public constructor(): R|kotlin/Throwable|
 
-    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?)
+    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?): R|kotlin/Throwable|
 
 }
 
 public final object Unit : R|kotlin/Any| {
     public open fun toString(): R|kotlin/String|
 
-    private constructor()
+    private constructor(): R|kotlin/Unit|
 
 }
 
 public final annotation class UnsafeVariance : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|kotlin/UnsafeVariance|
 
 }
-

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt

@@ -1,4 +1,4 @@
 public final annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/AnnotatedAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt

@@ -1,6 +1,6 @@
 public open class AnnotatedMethod : R|kotlin/Any| {
     public open fun f(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/AnnotatedMethod|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt

@@ -1,24 +1,24 @@
 public final class AnnotationInAnnotationArguments : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/AnnotationInAnnotationArguments|
 
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
 
 public final annotation class EnumOption : R|kotlin/Annotation| {
-    public constructor(option: R|test/E|)
+    public constructor(option: R|test/E|): R|test/EnumOption|
 
 }
 
 public final annotation class OptionGroups : R|kotlin/Annotation| {
-    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|)
+    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|): R|test/OptionGroups|
 
 }
 
 public final annotation class StringOptions : R|kotlin/Annotation| {
-    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|): R|test/StringOptions|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|)
+    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|): R|test/Anno|
 
 }
 
 public final class Klass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Klass|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt

@@ -1,21 +1,21 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor()
+    private constructor(): R|test/E|
 
 }
 
 public final annotation class EnumAnno : R|kotlin/Annotation| {
-    public constructor(value: R|test/E|)
+    public constructor(value: R|test/E|): R|test/EnumAnno|
 
 }
 
 public final class EnumArgumentWithCustomToString : R|kotlin/Any| {
     public final fun annotated(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/EnumArgumentWithCustomToString|
 
 }
 
 public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
-    public constructor(vararg value: R|kotlin/Array<out test/E>|)
+    public constructor(vararg value: R|kotlin/Array<out test/E>|): R|test/EnumArrayAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt

@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(s: R|kotlin/String|)
+    public constructor(s: R|kotlin/String|): R|test/Anno|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|)
+    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|): R|test/Anno|
 
 }
 
 public final class Klass : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Klass|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt

@@ -1,4 +1,4 @@
 public final annotation class SimpleAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/SimpleAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt

@@ -1,4 +1,4 @@
 public final annotation class TargetedAnnotation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/TargetedAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|)
+    public constructor(value: R|kotlin/String|): R|test/Anno|
 
 }
 
 public final class Constructor : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Constructor|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt

@@ -1,14 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|)
+    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|): R|test/Anno|
 
 }
 
 public final annotation class Bnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Bnno|
 
 }
 
 public final enum class Eee : R|kotlin/Enum<test/Eee>| {
-    private constructor()
+    private constructor(): R|test/Eee|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt

@@ -1,24 +1,24 @@
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Ann|
 
 }
 
 public sealed class Sealed : R|kotlin/Any| {
-    private constructor(z: R|test/Z|)
+    private constructor(z: R|test/Z|): R|test/Sealed|
 
     public final class Derived : R|test/Sealed| {
-        public constructor(z: R|test/Z|)
+        public constructor(z: R|test/Z|): R|test/Sealed.Derived|
 
     }
 
 }
 
 public final class Test : R|kotlin/Any| {
-    public constructor(z: R|test/Z|, a: R|kotlin/Int|)
+    public constructor(z: R|test/Z|, a: R|kotlin/Int|): R|test/Test|
 
-    private constructor(z: R|test/Z|, s: R|kotlin/String|)
+    private constructor(z: R|test/Z|, s: R|kotlin/String|): R|test/Test|
 
-    public constructor(z: R|test/Z|)
+    public constructor(z: R|test/Z|): R|test/Test|
 
 }
 
@@ -29,6 +29,6 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/Int|)
+    public constructor(x: R|kotlin/Int|): R|test/Z|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt

@@ -5,6 +5,6 @@ public final inline class Z : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    internal constructor(value: R|kotlin/Int|)
+    internal constructor(value: R|kotlin/Int|): R|test/Z|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt

@@ -9,6 +9,6 @@ public final data class My : R|kotlin/Any| {
 
     public open fun toString(): R|kotlin/String|
 
-    public constructor(x: R|kotlin/Int|)
+    public constructor(x: R|kotlin/Int|): R|test/My|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt

@@ -1,18 +1,18 @@
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt

@@ -1,19 +1,19 @@
 public final annotation class $$$$$$ : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/$$$$$$|
 
 }
 
 public final class A : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Anno$tation : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno$tation|
 
 }
 
 public final class Cla$s : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Cla$s|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt

@@ -1,23 +1,23 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/Class.Companion|
 
     }
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt

@@ -1,19 +1,19 @@
 public final annotation class A1 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A1|
 
 }
 
 public final annotation class A2 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A2|
 
 }
 
 public final annotation class A3 : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A3|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt

@@ -1,18 +1,18 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/Class.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class X : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/X|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt

@@ -1,44 +1,44 @@
 public final annotation class BooleanAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Boolean|)
+    public constructor(value: R|kotlin/Boolean|): R|test/BooleanAnno|
 
 }
 
 public final annotation class ByteAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Byte|)
+    public constructor(value: R|kotlin/Byte|): R|test/ByteAnno|
 
 }
 
 public final annotation class CharAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Char|)
+    public constructor(value: R|kotlin/Char|): R|test/CharAnno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Double|)
+    public constructor(value: R|kotlin/Double|): R|test/DoubleAnno|
 
 }
 
 public final annotation class FloatAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Float|)
+    public constructor(value: R|kotlin/Float|): R|test/FloatAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Int|)
+    public constructor(value: R|kotlin/Int|): R|test/IntAnno|
 
 }
 
 public final annotation class LongAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Long|)
+    public constructor(value: R|kotlin/Long|): R|test/LongAnno|
 
 }
 
 public final annotation class ShortAnno : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Short|)
+    public constructor(value: R|kotlin/Short|): R|test/ShortAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|)
+    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt

@@ -1,6 +1,6 @@
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(t: R|java/lang/annotation/ElementType|)
+    public constructor(t: R|java/lang/annotation/ElementType|): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt

@@ -3,6 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|)
+    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt

@@ -1,6 +1,6 @@
 public final fun function(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt

@@ -3,6 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|)
+    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt

@@ -1,14 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|)
+    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt

@@ -1,14 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
-    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/E|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt

@@ -1,6 +1,6 @@
 public final fun R|kotlin/Int|.foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun R|kotlin/String|.foo(x: R|kotlin/Int|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt

@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt

@@ -1,11 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt

@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt

@@ -1,18 +1,18 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(s: R|kotlin/String|)
+    public constructor(s: R|kotlin/String|): R|test/A|
 
 }
 
 public final class Outer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Outer|
 
     public final inner class Inner : R|kotlin/Any| {
-        public constructor(y: R|kotlin/String|)
+        public constructor(y: R|kotlin/String|): R|test/Outer.Inner|
 
     }
 
     public final class Nested : R|kotlin/Any| {
-        public constructor(x: R|kotlin/String|)
+        public constructor(x: R|kotlin/String|): R|test/Outer.Nested|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt

@@ -3,21 +3,21 @@ public final fun bar(x: R|kotlin/Int|): R|kotlin/Unit|
 public final fun foo(x: R|kotlin/Int|, y: R|kotlin/Double|, z: R|kotlin/String|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/B|
 
 }
 
 public final annotation class C : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/C|
 
 }
 
 public final annotation class D : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/D|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt

@@ -1,9 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt

@@ -1,6 +1,6 @@
 public final fun foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt

@@ -1,19 +1,19 @@
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/DoubleAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/IntAnno|
 
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/StringAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt

@@ -1,14 +1,14 @@
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/DoubleAnno|
 
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/IntAnno|
 
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/StringAnno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt

@@ -1,10 +1,10 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
     public abstract interface Trait : R|kotlin/Any| {
     }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt

@@ -1,4 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt

@@ -1,5 +1,5 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt

@@ -7,31 +7,31 @@ public final class A : R|kotlin/Any| {
 
     public final fun simple(s: R|kotlin/String|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor(klass: R|kotlin/reflect/KClass<*>|)
+    public constructor(klass: R|kotlin/reflect/KClass<*>|): R|test/Ann|
 
 }
 
 <T> public final class Generic : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Generic<T>|
 
 }
 
 <A, B> public final class InnerGeneric : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/InnerGeneric<A, B>|
 
     <C, D> public final inner class Inner : R|kotlin/Any| {
-        public constructor()
+        public constructor(): R|test/InnerGeneric.Inner<C, D>|
 
     }
 
 }
 
 public final class Simple : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Simple|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt

@@ -1,6 +1,6 @@
 public final fun R|kotlin/String|.foo(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt

@@ -1,11 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class SimpleTypeAnnotation : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/ranges/IntRange|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/SimpleTypeAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt

@@ -1,13 +1,13 @@
 public final fun typeAnnotation(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class TypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/TypeParameterAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt

@@ -1,5 +1,5 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt

@@ -1,11 +1,11 @@
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|)
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|): R|test/Ann|
 
 }
 
 public final class TypeAnnotationWithArguments : R|kotlin/Any| {
     public final fun foo(param: R|kotlin/ranges/IntRange|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/TypeAnnotationWithArguments|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt

@@ -1,6 +1,6 @@
 public final fun foo(bar: R|kotlin/collections/Map<kotlin/String, kotlin/collections/List<kotlin/Int>>|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt

@@ -1,11 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/SimpleTypeParameterAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt

@@ -1,11 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|)
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|): R|test/A|
 
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
-    public constructor()
+    public constructor(): R|test/SimpleTypeParameterAnnotation|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt

@@ -1,16 +1,16 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 
 public final class CustomDelegate : R|kotlin/Any| {
     public final operator fun getValue(thisRef: R|kotlin/Any|?, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/CustomDelegate|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt

@@ -1,9 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Anno|
 
 }
 
 public final class Class : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt

@@ -1,10 +1,10 @@
 public final annotation class A : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/String|)
+    public constructor(value: R|kotlin/String|): R|test/A|
 
 }
 
 public final annotation class B : R|kotlin/Annotation| {
-    public constructor(value: R|kotlin/Array<kotlin/String>|)
+    public constructor(value: R|kotlin/Array<kotlin/String>|): R|test/B|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt

@@ -1,11 +1,11 @@
 public final class A : R|kotlin/Any| {
     public final fun R|kotlin/String|.myLength(q: R|kotlin/String|): R|kotlin/Int|
 
-    public constructor()
+    public constructor(): R|test/A|
 
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
-    public constructor()
+    public constructor(): R|test/Ann|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt

@@ -1,4 +1,4 @@
 public final class Ramification : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Ramification|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt

@@ -1,4 +1,4 @@
 <T> public final class Wine : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Wine<T>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt

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

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt

@@ -1,18 +1,18 @@
 <test> public final class ConstructorTypeParamClassObjectConflict : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ConstructorTypeParamClassObjectConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/ConstructorTypeParamClassObjectConflict.Companion|
 
     }
 
 }
 
 <test> public final class ConstructorTypeParamClassObjectTypeConflict : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict<test>|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/ConstructorTypeParamClassObjectTypeConflict.Companion|
 
         public abstract interface test : R|kotlin/Any| {
         }
@@ -22,30 +22,30 @@
 }
 
 public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/TestClassObjectAndClassConflict|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TestClassObjectAndClassConflict.Companion|
 
     }
 
 }
 
 public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
-    public constructor(test: R|kotlin/String|)
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorParamClassObjectConflict|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TestConstructorParamClassObjectConflict.Companion|
 
     }
 
 }
 
 public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
-    public constructor(test: R|kotlin/String|)
+    public constructor(test: R|kotlin/String|): R|test/TestConstructorValClassObjectConflict|
 
     public final companion object Companion : R|kotlin/Any| {
-        private constructor()
+        private constructor(): R|test/TestConstructorValClassObjectConflict.Companion|
 
     }
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt

@@ -1,4 +1,4 @@
 <T> public final class Juice : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Juice<T>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt

@@ -1,4 +1,4 @@
 <T> public final class Beer : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Beer<T>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt

@@ -1,4 +1,4 @@
 <A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassParamReferencesParam<A, B>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt

@@ -1,4 +1,4 @@
 <A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassParamReferencesParam<A, B>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt

@@ -1,5 +1,5 @@
 <A> public final class ClassParamReferencesSelf : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassParamReferencesSelf<A>|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt

@@ -1,4 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Clock<A>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt

@@ -1,4 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Clock<A>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt

@@ -1,4 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Clock<A>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt

@@ -1,4 +1,4 @@
 <P, Q> public final class ClassTwoParams : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassTwoParams<P, Q>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt

@@ -1,4 +1,4 @@
 <P, Q> public final class ClassTwoParams : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/ClassTwoParams<P, Q>|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt

@@ -1,4 +1,4 @@
 public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test/EnumWithGenericConstructorParameter>| {
-    private constructor(list: R|kotlin/collections/List<kotlin/String>|?)
+    private constructor(list: R|kotlin/collections/List<kotlin/String>|?): R|test/EnumWithGenericConstructorParameter|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt

@@ -1,4 +1,4 @@
 public final enum class EnumWithPrimitiveConstructorParameter : R|kotlin/Enum<test/EnumWithPrimitiveConstructorParameter>| {
-    private constructor(b: R|kotlin/Boolean|)
+    private constructor(b: R|kotlin/Boolean|): R|test/EnumWithPrimitiveConstructorParameter|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt

@@ -1,9 +1,9 @@
 public abstract class Aaa : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Aaa|
 
 }
 
 public final class Bbb : R|test/Aaa| {
-    public constructor()
+    public constructor(): R|test/Bbb|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt

@@ -1,9 +1,9 @@
 <P> public abstract class Aaa : R|kotlin/Any| {
-    public constructor()
+    public constructor(): R|test/Aaa<P>|
 
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
-    public constructor()
+    public constructor(): R|test/Bbb|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt

@@ -8,6 +8,6 @@
 public final class B : R|test/A<kotlin/String>| {
     public open fun bar(): R|kotlin/String|
 
-    public constructor()
+    public constructor(): R|test/B|
 
 }

compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt

@@ -1,5 +1,5 @@
 public open class Class : R|test/Trait| {
-    public constructor()
+    public constructor(): R|test/Class|
 
 }
 

compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt

@@ -2,6 +2,6 @@
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
-    public constructor()
+    public constructor(): R|test/Bbb|
 
 }