diff --git a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
index be114890feb..e6e672164da 100644
--- a/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
+++ b/compiler/fir/java/src/org/jetbrains/kotlin/fir/java/JavaSymbolProvider.kt
@@ -7,6 +7,9 @@ package org.jetbrains.kotlin.fir.java
 
 import com.intellij.openapi.project.Project
 import com.intellij.psi.search.GlobalSearchScope
+import org.jetbrains.kotlin.descriptors.ClassKind
+import org.jetbrains.kotlin.descriptors.Visibilities
+import org.jetbrains.kotlin.descriptors.Visibility
 import org.jetbrains.kotlin.fir.FirSession
 import org.jetbrains.kotlin.fir.declarations.FirRegularClass
 import org.jetbrains.kotlin.fir.declarations.FirTypeParameter
@@ -206,14 +209,14 @@ class JavaSymbolProvider(
                         }
                         declarations += firJavaMethod
                     }
-                    for (javaConstructor in javaClass.constructors) {
-                        val constructorId = CallableId(classId.packageFqName, classId.relativeClassName, classId.shortClassName)
+                    val javaClassDeclaredConstructors = javaClass.constructors
+                    val constructorId = CallableId(classId.packageFqName, classId.relativeClassName, classId.shortClassName)
+
+                    fun addJavaConstructor(visibility: Visibility = Visibilities.PUBLIC): FirJavaConstructor {
                         val constructorSymbol = FirFunctionSymbol(constructorId)
                         val classTypeParameters = javaClass.typeParameters.convertTypeParameters(javaTypeParameterStack)
-                        val constructorTypeParameters = javaConstructor.typeParameters.convertTypeParameters(javaTypeParameterStack)
-                        val typeParameters = classTypeParameters + constructorTypeParameters
                         val firJavaConstructor = FirJavaConstructor(
-                            this@JavaSymbolProvider.session, constructorSymbol, javaConstructor.visibility,
+                            this@JavaSymbolProvider.session, constructorSymbol, visibility,
                             FirResolvedTypeRefImpl(
                                 this@JavaSymbolProvider.session, null,
                                 firSymbol.constructType(
@@ -221,7 +224,18 @@ class JavaSymbolProvider(
                                 )
                             )
                         ).apply {
-                            this.typeParameters += typeParameters
+                            this.typeParameters += classTypeParameters
+                        }
+                        declarations += firJavaConstructor
+                        return firJavaConstructor
+                    }
+
+                    if (javaClassDeclaredConstructors.isEmpty() && javaClass.classKind == ClassKind.CLASS) {
+                        addJavaConstructor()
+                    }
+                    for (javaConstructor in javaClassDeclaredConstructors) {
+                        addJavaConstructor(javaConstructor.visibility).apply {
+                            this.typeParameters += javaConstructor.typeParameters.convertTypeParameters(javaTypeParameterStack)
                             addAnnotationsFrom(this@JavaSymbolProvider.session, javaConstructor, javaTypeParameterStack)
                             for (valueParameter in javaConstructor.valueParameters) {
                                 valueParameters += valueParameter.toFirValueParameters(
@@ -229,7 +243,6 @@ class JavaSymbolProvider(
                                 )
                             }
                         }
-                        declarations += firJavaConstructor
                     }
                 }
             }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
index 54615ef2bb2..fe111d7c82c 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/NonNullNever.fir.txt
@@ -5,4 +5,6 @@ public open class NonNullNever : R|kotlin/Any| {
 
     @R|MyNullable|() public open operator fun foo(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.NEVER|()) x: R|kotlin/String|?, @R|MyNullable|() y: R|kotlin/CharSequence|?): R|kotlin/String|?
 
+    public constructor(): R|NonNullNever|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
index d50c277836f..916420106d3 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/Simple.fir.txt
@@ -5,4 +5,6 @@ public open class Simple : R|kotlin/Any| {
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
+    public constructor(): R|Simple|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
index 78ab5f83aee..e4956c5d065 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/Strange.fir.txt
@@ -5,4 +5,6 @@ public open class Strange : R|kotlin/Any| {
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
+    public constructor(): R|Strange|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
index 37ae9bcb24d..fb81de8dd31 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/FieldsAreNullable.fir.txt
@@ -7,6 +7,8 @@
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
+    public constructor(): R|A|
+
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|kotlin/Annotation| {
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
index f4341f53c92..86c90c790e6 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibility.fir.txt
@@ -3,6 +3,8 @@
 
     @R|spr/ForceFlexibility|() public open operator fun bar(x: R|ft<kotlin/String, kotlin/String?>|!, @R|javax/annotation/Nonnull|() y: R|kotlin/CharSequence|): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|A|
+
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|spr/UnknownNullability|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class ForceFlexibility : R|kotlin/Annotation| {
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
index 95b62269e68..000e9ee06e2 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ForceFlexibleOverOverrides.fir.txt
@@ -7,6 +7,8 @@
 
     public open operator fun foobar(@R|javax/annotation/Nonnull|(R|javax/annotation/meta/When.UNKNOWN|()) x: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
 public abstract interface B : R|kotlin/Any| {
     public abstract operator fun foo(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/Unit|
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
index 2b0993148a7..7bd54396c9f 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/NullabilityFromOverridden.fir.txt
@@ -11,6 +11,8 @@
 
     public open operator fun baz(@R|javax/annotation/Nonnull|() x: R|kotlin/String|): R|kotlin/String|
 
+    public constructor(): R|A|
+
 }
 @R|NonNullApi|() public abstract interface AInt : R|kotlin/Any| {
     public abstract operator fun foo1(x: R|kotlin/String|): R|kotlin/CharSequence|
@@ -35,6 +37,8 @@
 
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
+    public constructor(): R|B|
+
 }
 @R|NonNullApi|() public open class C : R|A|, R|AInt| {
     public open operator fun foo1(x: R|kotlin/String|): R|kotlin/String|
@@ -47,6 +51,8 @@
 
     public open operator fun baz(x: R|kotlin/String|): R|kotlin/String|
 
+    public constructor(): R|C|
+
 }
 @R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|(), R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
index 0ce805fb595..17fb8daa9e6 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/OverridingDefaultQualifier.fir.txt
@@ -9,6 +9,8 @@
 
     @R|javax/annotation/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
+    public constructor(): R|A|
+
 }
 @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/CheckForNull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.FIELD|())) public abstract annotation class FieldsAreNullable : R|kotlin/Annotation| {
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
index 6abb6bd8fd4..b062f4511ae 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefault.fir.txt
@@ -5,4 +5,6 @@
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
index f5971430d74..d9ff9d5f1e0 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/ParametersAreNonnullByDefaultPackage.fir.txt
@@ -5,6 +5,8 @@ public open class A : R|kotlin/Any| {
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
+    public constructor(): R|test/A|
+
 }
 public open class A2 : R|kotlin/Any| {
     @R|javax/annotation/Nullable|() public open field field: R|kotlin/String|?
@@ -13,4 +15,6 @@ public open class A2 : R|kotlin/Any| {
 
     @R|javax/annotation/Nonnull|() public open operator fun bar(): R|kotlin/String|
 
+    public constructor(): R|test2/A2|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
index bdcba5b0cdd..86f54f3ce10 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullable.fir.txt
@@ -7,6 +7,8 @@
 
     @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
+    public constructor(): R|A|
+
 }
 @R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.TYPE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
diff --git a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
index ac16b4f66d3..28143c27686 100644
--- a/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/jsr305/typeQualifierDefault/SpringNullablePackage.fir.txt
@@ -7,6 +7,8 @@ public open class A : R|kotlin/Any| {
 
     @R|spr/Nullable|() public open operator fun baz(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>?, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|?
 
+    public constructor(): R|test/A|
+
 }
 @R|java/lang/annotation/Target|(R|java/lang/annotation/ElementType.PACKAGE|()) @R|java/lang/annotation/Retention|(R|java/lang/annotation/RetentionPolicy.RUNTIME|()) @R|java/lang/annotation/Documented|() @R|javax/annotation/Nonnull|() @R|javax/annotation/meta/TypeQualifierDefault|(<implicitArrayOf>(R|java/lang/annotation/ElementType.METHOD|(), R|java/lang/annotation/ElementType.PARAMETER|())) public abstract annotation class NonNullApi : R|kotlin/Annotation| {
 }
diff --git a/compiler/fir/resolve/testData/enhancement/mapping/AbstractMap.fir.txt b/compiler/fir/resolve/testData/enhancement/mapping/AbstractMap.fir.txt
index a049f0507fc..603e50dac32 100644
--- a/compiler/fir/resolve/testData/enhancement/mapping/AbstractMap.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/mapping/AbstractMap.fir.txt
@@ -1,2 +1,4 @@
 public abstract class AbstractMap : R|kotlin/Any|, R|kotlin/collections/MutableMap<kotlin/String, kotlin/String>| {
+    public constructor(): R|AbstractMap|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
index b822ceeeca9..605674af56b 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultEnum.fir.txt
@@ -7,6 +7,8 @@ public/*package*/ open class A : R|kotlin/Any| {
 
     public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(NOT_ENTRY_EITHER)) arg: R|ft<Mixed, Mixed?>|! = R|/Mixed.NOT_ENTRY_EITHER|): R|ft<Mixed, Mixed?>|!
 
+    public constructor(): R|A|
+
 }
 public final enum class Mixed : R|kotlin/Enum<Mixed>| {
     public final static field NOT_ENTRY_EITHER: R|ft<Mixed, Mixed?>|!
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
index 66a1b8aa8fc..8224d5981e8 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultLongLiteral.fir.txt
@@ -7,6 +7,8 @@ public open class A : R|kotlin/Any| {
 
     public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1010)) value: R|ft<kotlin/Long, kotlin/Long?>|! = Long(10)): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
 public open class B : R|kotlin/Any| {
     public open operator fun first(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0x)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
@@ -17,4 +19,6 @@ public open class B : R|kotlin/Any| {
 
     public open operator fun fourth(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(0B1234)) value: R|ft<kotlin/Long, kotlin/Long?>|!): R|kotlin/Unit|
 
+    public constructor(): R|B|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
index 57995fc1353..42cc2857842 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNull.fir.txt
@@ -3,8 +3,12 @@ public open class A : R|kotlin/Any| {
 
     public open operator fun bar(@R|kotlin/annotations/jvm/internal/DefaultNull|() x: R|kotlin/Int| = Null(null)): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
 public open class B<T> : R|kotlin/Any| {
     public open operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultNull|() t: R|ft<T, T?>|! = Null(null)): R|kotlin/Unit|
 
+    public constructor<T>(): R|B<T>|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
index b828eb9b329..7c6d37193ac 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultNullAndParameter.fir.txt
@@ -7,6 +7,8 @@ public open class A : R|kotlin/Any| {
 
     public open operator fun baz(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
 public abstract interface AInt : R|kotlin/Any| {
     public abstract operator fun foo(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) i: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
@@ -21,6 +23,10 @@ public open class B : R|A| {
 
     public open operator fun bam(@R|kotlin/annotations/jvm/internal/DefaultNull|() @R|kotlin/annotations/jvm/internal/DefaultValue|(String(42)) a: R|ft<kotlin/Int, kotlin/Int?>|! = Int(42)): R|kotlin/Unit|
 
+    public constructor(): R|B|
+
 }
 public open class C : R|A|, R|AInt| {
+    public constructor(): R|C|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
index 45579b6163c..16c838afe58 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/DefaultParameter.fir.txt
@@ -9,4 +9,6 @@ public/*package*/ open class A : R|kotlin/Any| {
 
     public open operator fun wrong(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(hello)) i: R|ft<kotlin/Int, kotlin/Int?>|!): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
index de556054ed6..8a9f95fa935 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/EmptyParameterName.fir.txt
@@ -5,4 +5,6 @@ public/*package*/ open class A : R|kotlin/Any| {
 
     public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(Int(42)) first: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
index d237af09dd7..86506d19fab 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/ReorderedParameterNames.fir.txt
@@ -1,4 +1,6 @@
 public open class A : R|kotlin/Any| {
     public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(port)) port: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
index dd6f72a5ebb..5cba14860fe 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SameParameterName.fir.txt
@@ -1,4 +1,6 @@
 public open class A : R|kotlin/Any| {
     public open operator fun same(@R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) first: R|ft<kotlin/String, kotlin/String?>|!, @R|kotlin/annotations/jvm/internal/ParameterName|(String(ok)) second: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
index 949cfd6111b..88a82eed62d 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/SpecialCharsParameterName.fir.txt
@@ -3,4 +3,6 @@ public open class A : R|kotlin/Any| {
 
     public open operator fun numberName(@R|kotlin/annotations/jvm/internal/ParameterName|(String(42)) field: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
index c9e827e37c8..3ba4e3951c7 100644
--- a/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
+++ b/compiler/fir/resolve/testData/enhancement/signatureAnnotations/StaticMethodWithDefaultValue.fir.txt
@@ -1,4 +1,6 @@
 public/*package*/ open class A : R|kotlin/Any| {
     public open static operator fun withDefault(@R|kotlin/annotations/jvm/internal/DefaultValue|(String(OK)) arg: R|ft<kotlin/String, kotlin/String?>|! = String(OK)): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|A|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
index 9c9f6b85a9b..4727e246cfd 100644
--- a/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ArrayTypeVariance.fir.txt
@@ -1,4 +1,6 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
     public final operator fun toArray(p0: R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|
 
+    public constructor(): R|test/ArrayTypeVariance|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fir.txt b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fir.txt
index 1c7b9159206..b5b7ce481a9 100644
--- a/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassDoesNotOverrideMethod.fir.txt
@@ -1,2 +1,4 @@
 public abstract class ClassDoesNotOverrideMethod : R|java/util/Date| {
+    public constructor(): R|test/ClassDoesNotOverrideMethod|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt
index 1221b0d6f52..442a0cbee86 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithConstVal.fir.txt
@@ -3,4 +3,6 @@ public final class ClassWithConstVal : R|kotlin/Any| {
 
     public final field f2: R|kotlin/Int|
 
+    public constructor(): R|test/ClassWithConstVal|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
index 08f9f44a2b6..d62fc3e3904 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypeP.fir.txt
@@ -1,2 +1,4 @@
 public final class ClassWithTypeP<P> : R|kotlin/Any| {
+    public constructor<P>(): R|test/ClassWithTypeP<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
index 6816e45886b..c4810b10629 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePExtendsIterableP.fir.txt
@@ -1,2 +1,4 @@
 public abstract class ClassWithTypePExtendsIterableP<P> : R|kotlin/Any|, R|kotlin/collections/MutableIterable<P>| {
+    public constructor<P>(): R|test/ClassWithTypePExtendsIterableP<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
index 7949fcc5f46..53be87bc02c 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePP.fir.txt
@@ -1,2 +1,4 @@
-public final class ClassWithTypePP<P, Q : R|P|> : R|kotlin/Any| {
+public final class ClassWithTypePP<P, Q : R|P|, R|P|> : R|kotlin/Any| {
+    public constructor<P, Q : R|P|, R|P|>(): R|test/ClassWithTypePP<P, Q>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
index ac8bd69effb..95e6d10b368 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefNext.fir.txt
@@ -1,2 +1,4 @@
-public open class ClassWithTypePRefNext<R : R|kotlin/collections/MutableIterable<P>|, P> : R|kotlin/Any| {
+public open class ClassWithTypePRefNext<R : R|kotlin/collections/MutableIterable<P>|, R|kotlin/collections/MutableIterable<P>|, P> : R|kotlin/Any| {
+    public constructor<R : R|kotlin/collections/MutableIterable<P>|, R|kotlin/collections/MutableIterable<P>|, P>(): R|test/ClassWithTypePRefNext<R, P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
index 2ca266a78ab..989ed3dfb57 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelf.fir.txt
@@ -1,2 +1,4 @@
-public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>|> : R|kotlin/Any| {
+public final class ClassWithTypePRefSelf<P : R|kotlin/Enum<P>|, R|kotlin/Enum<P>|> : R|kotlin/Any| {
+    public constructor<P : R|kotlin/Enum<P>|, R|kotlin/Enum<P>|>(): R|test/ClassWithTypePRefSelf<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
index dc2bf1dae47..1d762fca539 100644
--- a/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/ClassWithTypePRefSelfAndClass.fir.txt
@@ -1,2 +1,4 @@
-public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|> : R|kotlin/Any| {
+public final class ClassWithTypePRefSelfAndClass<P : R|test/ClassWithTypePRefSelfAndClass<P>|, R|test/ClassWithTypePRefSelfAndClass<P>|> : R|kotlin/Any| {
+    public constructor<P : R|test/ClassWithTypePRefSelfAndClass<P>|, R|test/ClassWithTypePRefSelfAndClass<P>|>(): R|test/ClassWithTypePRefSelfAndClass<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt b/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt
index a327559a686..2c39743d2c7 100644
--- a/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/FieldAsVar.fir.txt
@@ -1,4 +1,6 @@
 public final class FieldAsVar : R|kotlin/Any| {
     public open field f: R|kotlin/Int|
 
+    public constructor(): R|test/FieldAsVar|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
index eed9c46c9fb..763f8f273d7 100644
--- a/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/FieldOfArrayType.fir.txt
@@ -1,4 +1,6 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
     public open field files: R|kotlin/Array<ft<java/io/File, java/io/File?>>|
 
+    public constructor(): R|test/FieldOfArrayType|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt
index f9ab633ee46..a5bce6ba62c 100644
--- a/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/FinalFieldAsVal.fir.txt
@@ -1,4 +1,6 @@
 public final class FinalFieldAsVal : R|kotlin/Any| {
     public final field f: R|kotlin/Int|
 
+    public constructor(): R|test/FinalFieldAsVal|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
index 284a54631cf..98fff664f4f 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypes.fir.txt
@@ -1,2 +1,4 @@
 public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
+    public constructor(): R|test/InheritMethodsDifferentReturnTypes|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
index 5c1ec98e9ba..ebadbf34b07 100644
--- a/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InheritMethodsDifferentReturnTypesGeneric.fir.txt
@@ -1,2 +1,4 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
+    public constructor(): R|test/InheritMethodsDifferentReturnTypesGeneric|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt
index 6c423d6f72f..20600fe93b8 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClass.fir.txt
@@ -1,2 +1,4 @@
 public open class InnerClass : R|kotlin/Any| {
+    public constructor(): R|test/InnerClass|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
index d2a032e657c..c6d3bfa061f 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassReferencesOuterTP.fir.txt
@@ -1,2 +1,4 @@
 public open class InnerClassReferencesOuterTP<P> : R|kotlin/Any| {
+    public constructor<P>(): R|test/InnerClassReferencesOuterTP<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
index 804873f659e..b8fce28ab68 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassTypeMultipleGeneric.fir.txt
@@ -1,4 +1,6 @@
 public open class InnerClassTypeMultipleGeneric : R|kotlin/Any| {
     public open operator fun staticType(): R|ft<test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>, test/InnerClassTypeMultipleGeneric.Outer.Inner<ft<kotlin/Byte, kotlin/Byte?>, ft<kotlin/Char, kotlin/Char?>, ft<kotlin/Boolean, kotlin/Boolean?>>?>|!
 
+    public constructor(): R|test/InnerClassTypeMultipleGeneric|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
index 609eb1d257e..2a458093c96 100644
--- a/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerClassesInGeneric.fir.txt
@@ -1,2 +1,4 @@
 public open class InnerClassesInGeneric<P, Q> : R|kotlin/Any| {
+    public constructor<P, Q>(): R|test/InnerClassesInGeneric<P, Q>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
index cacb2e956c0..2581f4ddce4 100644
--- a/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/InnerOfGeneric.fir.txt
@@ -1,2 +1,4 @@
 public open class InnerOfGeneric : R|kotlin/Any| {
+    public constructor(): R|test/InnerOfGeneric|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
index 13121c0dc84..1243ccb9514 100644
--- a/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodReferencesOuterClassTP.fir.txt
@@ -1,2 +1,4 @@
 public final class MethodReferencesOuterClassTP<P> : R|kotlin/Any| {
+    public constructor<P>(): R|test/MethodReferencesOuterClassTP<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
index a66818cbb67..2bb1ef113c2 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePOneUpperBound.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
     public open operator fun <T : R|kotlin/Cloneable|> bar(): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodTypePOneUpperBound|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
index 8aae055bfe3..07b0b89ada3 100644
--- a/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodTypePTwoUpperBounds.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
     public open operator fun <T : R|kotlin/Cloneable|, R|java/lang/Runnable|> foo(): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodTypePTwoUpperBounds|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
index 26afacdf88c..09fc15632dd 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypeP.fir.txt
@@ -1,4 +1,6 @@
 public final class MethodWithTypeP : R|kotlin/Any| {
     public final operator fun <P> f(): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodWithTypeP|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
index 707656f1012..4b0f823d5e1 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePP.fir.txt
@@ -1,4 +1,6 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
     public final operator fun <P, Q : R|P|> f(): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodWithTypePP|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
index 411160484c2..ec77d8fe1c2 100644
--- a/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethodWithTypePRefClassP.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodWithTypePRefClassP<P> : R|kotlin/Any| {
     public final operator fun <Q : R|P|> f(): R|kotlin/Unit|
 
+    public constructor<P>(): R|test/MethodWithTypePRefClassP<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
index f6330bdebc0..dcd9335c8d7 100644
--- a/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/MethosWithPRefTP.fir.txt
@@ -1,4 +1,6 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
     public final operator fun <P> f(p: R|ft<P, P?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/MethosWithPRefTP|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt b/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt
index 3ef34d72cba..be6f897183a 100644
--- a/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/NestedClass.fir.txt
@@ -1,2 +1,4 @@
 public open class NestedClass : R|kotlin/Any| {
+    public constructor(): R|test/NestedClass|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
index ba05a63a5a7..083272fa120 100644
--- a/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/OverrideMethod.fir.txt
@@ -1,2 +1,4 @@
 public open class OverrideMethod : R|kotlin/Any| {
+    public constructor(): R|test/OverrideMethod|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
index 5e27a1623a2..883043108f6 100644
--- a/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PackageLocalVisibility.fir.txt
@@ -1,6 +1,8 @@
 public open class Frame : R|kotlin/Any| {
     public/*package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|awt/Frame|
+
 }
 public open class JFrame : R|awt/Frame| {
     protected/*protected and package*/ open field accessibleContext: R|ft<kotlin/String, kotlin/String?>|!
diff --git a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt
index bd138396b06..80c5e86d98b 100644
--- a/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/PrivateMembersInHierarchy.fir.txt
@@ -1,2 +1,4 @@
 public open class PrivateMembersInHierarchy : R|kotlin/Any| {
+    public constructor(): R|test/PrivateMembersInHierarchy|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
index 8277f5cbc2c..ade487575f3 100644
--- a/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/RawOverrides.fir.txt
@@ -1,2 +1,4 @@
 public open class RawOverrides : R|kotlin/Any| {
+    public constructor(): R|test/RawOverrides|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
index cf16b09afeb..4e11c10558b 100644
--- a/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/TopLevel$Class.fir.txt
@@ -1,4 +1,6 @@
 public open class TopLevel$Class : R|kotlin/Any| {
     public open operator fun foo(other: R|ft<test/TopLevel$Class, test/TopLevel$Class?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/TopLevel$Class|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt b/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt
index b6659e7eee0..5be5451f247 100644
--- a/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/TwoFields.fir.txt
@@ -3,4 +3,6 @@ public final class TwoFields : R|kotlin/Any| {
 
     public open field b: R|kotlin/Short|
 
+    public constructor(): R|test/TwoFields|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
index 2b69b6cbfbb..214e9b800ed 100644
--- a/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/UnboundWildcard.fir.txt
@@ -3,4 +3,6 @@ public final class UnboundWildcard : R|kotlin/Any| {
 
     public final operator fun collection(): R|ft<kotlin/collections/MutableCollection<*>, kotlin/collections/Collection<*>?>|!
 
+    public constructor(): R|test/UnboundWildcard|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
index 67dee53d1a6..8eaeb5c9433 100644
--- a/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/WildcardBounds.fir.txt
@@ -1,4 +1,6 @@
 public open class WildcardBounds : R|kotlin/Any| {
     public/*package*/ open operator fun foo(x: R|ft<test/WildcardBounds.A<out kotlin/CharSequence>, test/WildcardBounds.A<out kotlin/CharSequence>?>|!, y: R|ft<test/WildcardBounds.A<in kotlin/String>, test/WildcardBounds.A<in kotlin/String>?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/WildcardBounds|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
index b2d712700c2..fc0a1a9ebfa 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedField.fir.txt
@@ -3,4 +3,6 @@ public open class AnnotatedField : R|kotlin/Any| {
 
     @R|test/AnnotatedField.Anno|(String(member)) public final field y: R|kotlin/Int|
 
+    public constructor(): R|test/AnnotatedField|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
index 8b180ff81a8..2ab69ded03f 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedMethod.fir.txt
@@ -1,4 +1,6 @@
 public open class AnnotatedMethod : R|kotlin/Any| {
     @R|test/AnnotatedMethod.Anno|(Int(42)) public open operator fun f(): R|kotlin/Unit|
 
+    public constructor(): R|test/AnnotatedMethod|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
index 22d8ed87645..eed88130468 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedParameterInInnerClassConstructor.fir.txt
@@ -1,2 +1,4 @@
 public/*package*/ open class AnnotatedParameterInInnerClassConstructor : R|kotlin/Any| {
+    public constructor(): R|test/AnnotatedParameterInInnerClassConstructor|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
index 341cc8af381..adcac04b7cd 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedTypeInFun.fir.txt
@@ -1,4 +1,6 @@
 public/*package*/ open class AnnotatedTypeInFun : R|kotlin/Any| {
     public/*package*/ open operator fun foo(@R|test/AnnotatedTypeInFun.Anno|(String(a)) a: @R|test/AnnotatedTypeInFun.Anno|(String(a)) R|ft<kotlin/String, kotlin/String?>|!, @R|test/AnnotatedTypeInFun.Anno|(String(b)) b: @R|test/AnnotatedTypeInFun.Anno|(String(b)) R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/AnnotatedTypeInFun|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
index 13c74e91d06..c0ded39f978 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotatedValueParameter.fir.txt
@@ -1,4 +1,6 @@
 public open class AnnotatedValueParameter : R|kotlin/Any| {
     public open operator fun f(@R|test/AnnotatedValueParameter.Anno|(String(non-empty)) parameter: R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/AnnotatedValueParameter|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt
index 2392aa7891a..a6788e249f6 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationRetentions.fir.txt
@@ -1,2 +1,4 @@
 public open class AnnotationRetentions : R|kotlin/Any| {
+    public constructor(): R|test/AnnotationRetentions|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt
index 8600ddf4a22..6d5a6a4ec5e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/AnnotationTargets.fir.txt
@@ -1,2 +1,4 @@
 public open class AnnotationTargets : R|kotlin/Any| {
+    public constructor(): R|test/AnnotationTargets|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt
index 3f42c993451..258b1dfa399 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ArithmeticExpressionInParam.fir.txt
@@ -1,2 +1,4 @@
 public open class ArithmeticExpressionInParam : R|kotlin/Any| {
+    public constructor(): R|test/ArithmeticExpressionInParam|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
index bdba4392e37..33900d97ef3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectArrayInParam.fir.txt
@@ -1,2 +1,4 @@
 public open class ClassObjectArrayInParam : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectArrayInParam|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
index 246bfd1b5d8..c7ba20e1555 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParam.fir.txt
@@ -1,2 +1,4 @@
 public open class ClassObjectInParam : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectInParam|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
index b145b152832..72d26afdaa9 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamRaw.fir.txt
@@ -1,2 +1,4 @@
 public open class ClassObjectInParamRaw : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectInParamRaw|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
index 268096abf98..c6c33365ba3 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/ClassObjectInParamVariance.fir.txt
@@ -1,2 +1,4 @@
 public open class ClassObjectInParamVariance : R|kotlin/Any| {
+    public constructor(): R|test/ClassObjectInParamVariance|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
index b18e67dbafe..6e096e827fd 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/EnumArgumentWithCustomToString.fir.txt
@@ -1,4 +1,6 @@
 public open class EnumArgumentWithCustomToString : R|kotlin/Any| {
     @R|test/EnumArgumentWithCustomToString.EnumAnno|(R|test/EnumArgumentWithCustomToString.E.CAKE|()) @R|test/EnumArgumentWithCustomToString.EnumArrayAnno|(<implicitArrayOf>(R|test/EnumArgumentWithCustomToString.E.CAKE|(), R|test/EnumArgumentWithCustomToString.E.CAKE|())) public/*package*/ open operator fun annotated(): R|kotlin/Unit|
 
+    public constructor(): R|test/EnumArgumentWithCustomToString|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
index 7a85eec3d60..5587653aa5e 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/JavaDocDeprecated.fir.txt
@@ -1,4 +1,6 @@
 public open class JavaDocDeprecated : R|kotlin/Any| {
     public open operator fun getFoo(text: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/JavaDocDeprecated|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
index ccacdcc5b5a..dd893a798ec 100644
--- a/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/annotations/NestedEnumArgument.fir.txt
@@ -1,4 +1,6 @@
 public open class NestedEnumArgument : R|kotlin/Any| {
     @R|test/NestedEnumArgument.Anno|(R|test/NestedEnumArgument.E.FIRST|()) public/*package*/ open operator fun foo(): R|kotlin/Unit|
 
+    public constructor(): R|test/NestedEnumArgument|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
index 473ce317d65..17df800eefe 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/DifferentGetterAndSetter.fir.txt
@@ -3,4 +3,6 @@ public open class DifferentGetterAndSetter : R|kotlin/Any| {
 
     public open operator fun getSomething(): R|kotlin/Int|
 
+    public constructor(): R|test/DifferentGetterAndSetter|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
index a818c2950fb..f320ff33892 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVal.fir.txt
@@ -1,4 +1,6 @@
 public open class JavaBeanVal : R|kotlin/Any| {
     public open operator fun getColor(): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/JavaBeanVal|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
index 289d408cf3d..26c0752064e 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVar.fir.txt
@@ -3,4 +3,6 @@ public open class JavaBeanVar : R|kotlin/Any| {
 
     public open operator fun setColor(string: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/JavaBeanVar|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
index ca10cf19a28..bdfe8a0245e 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/JavaBeanVarOfGenericType.fir.txt
@@ -3,4 +3,6 @@ public open class JavaBeanVarOfGenericType<P> : R|kotlin/Any| {
 
     public open operator fun setCharacters(characters: R|ft<java/util/ArrayList<ft<P, P?>>, java/util/ArrayList<ft<P, P?>>?>|!): R|kotlin/Unit|
 
+    public constructor<P>(): R|test/JavaBeanVarOfGenericType<P>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
index aaca704209e..262fb5aae9c 100644
--- a/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/javaBean/TwoSetters.fir.txt
@@ -3,4 +3,6 @@ public open class TwoSetters : R|kotlin/Any| {
 
     public open operator fun setSize(size: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor(): R|test/TwoSetters|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
index 469cc3a57e1..9b0bcf905f5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/AllBoundsInWhen.fir.txt
@@ -1,4 +1,6 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
     public open operator fun <T : R|java/io/Serializable|> foo(): R|kotlin/Unit|
 
+    public constructor(): R|test/AllBoundsInWhen|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
index 7c7f7c16d53..d575d8a4d4d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/ArrayType.fir.txt
@@ -1,4 +1,6 @@
 public open class ArrayType : R|kotlin/Any| {
     public open operator fun foo(): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
 
+    public constructor(): R|test/ArrayType|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
index 131803e322e..2c886e25593 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/CustomProjectionKind.fir.txt
@@ -1,4 +1,6 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
     public open operator fun foo(): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
 
+    public constructor(): R|test/CustomProjectionKind|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
index e3cd4063aee..2c7fe13e51c 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithFunctionTypes.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
     public open operator fun foo(f: R|ft<kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/Function1<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>|!): R|ft<kotlin/Function0<ft<kotlin/String, kotlin/String?>>, kotlin/Function0<ft<kotlin/String, kotlin/String?>>?>|!
 
+    public constructor(): R|test/MethodWithFunctionTypes|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
index 772e63e43a0..fc9e96dabd5 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithGenerics.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
     public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/MethodWithGenerics|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
index 908874b49c9..25fd2ecf1b6 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithMappedClasses.fir.txt
@@ -3,4 +3,6 @@ public open class MethodWithMappedClasses : R|kotlin/Any| {
 
     public open operator fun <T> copyMap(dest: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, in T>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, in T>?>|!, src: R|ft<kotlin/collections/MutableMap<ft<kotlin/String, kotlin/String?>, ft<T, T?>>, kotlin/collections/Map<ft<kotlin/String, kotlin/String?>, ft<T, T?>>?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodWithMappedClasses|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
index a3c14aed3b5..176080ab902 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithTypeParameters.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
     public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!, list: R|ft<kotlin/collections/MutableList<in kotlin/String>, kotlin/collections/List<in kotlin/String>?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodWithTypeParameters|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
index b1d1367a3f0..ce0dc3f45da 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/MethodWithVararg.fir.txt
@@ -1,4 +1,6 @@
 public open class MethodWithVararg : R|kotlin/Any| {
     public open operator fun foo(vararg s: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
 
+    public constructor(): R|test/MethodWithVararg|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
index e9c5ad005c3..d8b3f99252d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyArrayTypes.fir.txt
@@ -5,4 +5,6 @@ public open class PropertyArrayTypes<T> : R|kotlin/Any| {
 
     public open field genericArray: R|kotlin/Array<ft<T, T?>>|
 
+    public constructor<T>(): R|test/PropertyArrayTypes<T>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
index 9c9fb0a7bec..1b8df9dcd26 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertyComplexTypes.fir.txt
@@ -7,4 +7,6 @@ public open class PropertyComplexTypes<T> : R|kotlin/Any| {
 
     public open field listOfGenericList: R|ft<java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>, java/util/ArrayList<ft<java/util/ArrayList<ft<T, T?>>, java/util/ArrayList<ft<T, T?>>?>>?>|!
 
+    public constructor<T>(): R|test/PropertyComplexTypes<T>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
index fe45b3b4282..f1ed7767942 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/PropertySimpleType.fir.txt
@@ -3,4 +3,6 @@ public open class PropertySimpleType : R|kotlin/Any| {
 
     public open field fieldTwo: R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/PropertySimpleType|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
index 808956593b4..b90314b4f1d 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/StarProjection.fir.txt
@@ -1,4 +1,6 @@
 public final class StarProjection : R|kotlin/Any| {
     public final operator fun foo(): R|ft<test/StarProjection.MyClass<*>, test/StarProjection.MyClass<*>?>|!
 
+    public constructor(): R|test/StarProjection|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
index b37998a0cc3..5089f2e2eea 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongProjectionKind.fir.txt
@@ -1,4 +1,6 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
     public open operator fun copy(from: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>>|, to: R|kotlin/Array<ft<kotlin/Number, kotlin/Number?>>|): R|ft<kotlin/collections/MutableList<ft<kotlin/Number, kotlin/Number?>>, kotlin/collections/List<ft<kotlin/Number, kotlin/Number?>>?>|!
 
+    public constructor(): R|test/WrongProjectionKind|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
index 36a10f4a18b..7b49d9da715 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongReturnTypeStructure.fir.txt
@@ -1,4 +1,6 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
     public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/WrongReturnTypeStructure|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
index b4ab2dcdeee..18bd8f88689 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.fir.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
     public open operator fun <A, B : R|java/lang/Runnable|, R|kotlin/collections/MutableList<kotlin/Cloneable>|> foo(a: R|ft<A, A?>|!, b: R|ft<kotlin/collections/MutableList<out B>, kotlin/collections/List<out B>?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/WrongTypeParameterBoundStructure1|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
index f87e6c4e9b2..f92ae8d7656 100644
--- a/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/kotlinSignature/error/WrongValueParameterStructure1.fir.txt
@@ -1,4 +1,6 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
     public open operator fun foo(a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/collections/MutableList<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>, kotlin/collections/List<ft<kotlin/collections/MutableMap.MutableEntry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>, kotlin/collections/Map.Entry<ft<kotlin/String, kotlin/String?>, ft<kotlin/String, kotlin/String?>>?>>?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/WrongValueParameterStructure1|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
index 8c62c1f8127..19f4705ebec 100644
--- a/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/library/Max.fir.txt
@@ -1,4 +1,6 @@
 public open class Max : R|kotlin/Any| {
     public open operator fun <T : R|kotlin/Any|, R|kotlin/Comparable<in T>|> max(coll: R|ft<kotlin/collections/MutableCollection<out T>, kotlin/collections/Collection<out T>?>|!): R|ft<T, T?>|!
 
+    public constructor(): R|test/Max|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
index 8318f85d2da..06e617e2e24 100644
--- a/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/modality/ModalityOfFakeOverrides.fir.txt
@@ -3,4 +3,6 @@ public open class ModalityOfFakeOverrides : R|java/util/AbstractList<kotlin/Stri
 
     @R|java/lang/Override|() public open operator fun size(): R|kotlin/Int|
 
+    public constructor(): R|test/ModalityOfFakeOverrides|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt
index 2f97824a9c3..cba89196f88 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullField.fir.txt
@@ -1,4 +1,6 @@
 public open class NotNullField : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() public open field hi: R|kotlin/String|
 
+    public constructor(): R|test/NotNullField|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt
index 3eb9412d018..c2f8d6feb27 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullIntArray.fir.txt
@@ -1,4 +1,6 @@
 public open class NotNullIntArray : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/IntArray|
 
+    public constructor(): R|test/NotNullIntArray|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt
index c199c2895ce..48a860c7464 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullMethod.fir.txt
@@ -1,4 +1,6 @@
 public open class NotNullMethod : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/String|
 
+    public constructor(): R|test/NotNullMethod|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
index 25672293962..e5c30dcf7f9 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullObjectArray.fir.txt
@@ -1,4 +1,6 @@
 public open class NotNullObjectArray : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() public open operator fun hi(): R|kotlin/Array<ft<kotlin/Any, kotlin/Any?>>|
 
+    public constructor(): R|test/NotNullObjectArray|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt
index 6e8ba6af528..149bd7017d7 100644
--- a/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/notNull/NotNullParameter.fir.txt
@@ -1,4 +1,6 @@
 public open class NotNullParameter : R|kotlin/Any| {
     public open operator fun hi(@R|org/jetbrains/annotations/NotNull|() param: R|kotlin/String|): R|kotlin/Unit|
 
+    public constructor(): R|test/NotNullParameter|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt
index 63594f1a550..ac1664544bf 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageConstructor.fir.txt
@@ -1,2 +1,4 @@
 public open class ProtectedPackageConstructor : R|kotlin/Any| {
+    public constructor(): R|test/ProtectedPackageConstructor|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt
index 0790a7bf33b..e3a8d2dc7c3 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageFun.fir.txt
@@ -1,4 +1,6 @@
 public open class ProtectedPackageFun : R|kotlin/Any| {
     protected/*protected and package*/ open operator fun foo(): R|kotlin/Unit|
 
+    public constructor(): R|test/ProtectedPackageFun|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt
index 83035e8bd22..f75c8d4a3cd 100644
--- a/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedPackage/ProtectedPackageProperty.fir.txt
@@ -1,4 +1,6 @@
 public open class ProtectedPackageProperty : R|kotlin/Any| {
     protected/*protected and package*/ open field foo: R|kotlin/Int|
 
+    public constructor(): R|test/ProtectedPackageProperty|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt
index 1155455e80a..4902ea8cf33 100644
--- a/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/protectedStatic/ConstructorInProtectedStaticNestedClass.fir.txt
@@ -1,2 +1,4 @@
 public open class ConstructorInProtectedStaticNestedClass : R|kotlin/Any| {
+    public constructor(): R|test/ConstructorInProtectedStaticNestedClass|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
index f88b112e7bd..1417c3a236a 100644
--- a/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/rendering/Rendering.fir.txt
@@ -1,2 +1,4 @@
 public open class Rendering : R|kotlin/Any| {
+    public constructor(): R|test/Rendering|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
index e176674edb8..155be419fa8 100644
--- a/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/DifferentParametersCount.fir.txt
@@ -1,2 +1,4 @@
 public final class DifferentParametersCount : R|kotlin/Any| {
+    public constructor(): R|test/DifferentParametersCount|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
index 49be6e73b84..c14952ba482 100644
--- a/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/FakeStaticOverrides.fir.txt
@@ -1,2 +1,4 @@
 public final class FakeStaticOverrides : R|kotlin/Any| {
+    public constructor(): R|test/FakeStaticOverrides|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
index 7bab262cf28..d9a364824c4 100644
--- a/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/StaticOverrides.fir.txt
@@ -1,2 +1,4 @@
 public final class StaticOverrides : R|kotlin/Any| {
+    public constructor(): R|test/StaticOverrides|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
index 9d6dcdbf7fd..9a0b8a038ac 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/AmbiguousAdapters.fir.txt
@@ -3,4 +3,6 @@ public open class AmbiguousAdapters : R|kotlin/Any| {
 
     public open operator fun foo(c: R|ft<java/io/Closeable, java/io/Closeable?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/AmbiguousAdapters|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
index d59735078d6..b5057aefda0 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/Basic.fir.txt
@@ -3,4 +3,6 @@ public open class Basic : R|kotlin/Any| {
 
     public open static operator fun bar(r: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/Basic|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
index eb9dd1b1ece..75618955ba2 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/NonTrivialFunctionType.fir.txt
@@ -7,4 +7,6 @@ public open class NonTrivialFunctionType : R|kotlin/Any| {
 
     public open operator fun wildcardBound(comparator: R|ft<java/util/Comparator<in kotlin/CharSequence>, java/util/Comparator<in kotlin/CharSequence>?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/NonTrivialFunctionType|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
index c0e2ace45a4..aabd13da124 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/PrivateSamAdapter.fir.txt
@@ -1,4 +1,6 @@
 public open class PrivateSamAdapter : R|kotlin/Any| {
     private open operator fun samAdapter(r: R|ft<test/PrivateSamAdapter.SamInterface, test/PrivateSamAdapter.SamInterface?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/PrivateSamAdapter|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
index d85ed5876eb..0fc68d74e9f 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/SeveralSamParameters.fir.txt
@@ -1,4 +1,6 @@
 public open class SeveralSamParameters : R|kotlin/Any| {
     public open static operator fun findMaxAndInvokeCallback(comparator: R|ft<java/util/Comparator<ft<kotlin/String, kotlin/String?>>, java/util/Comparator<ft<kotlin/String, kotlin/String?>>?>|!, a: R|ft<kotlin/String, kotlin/String?>|!, b: R|ft<kotlin/String, kotlin/String?>|!, afterRunnable: R|ft<java/lang/Runnable, java/lang/Runnable?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/SeveralSamParameters|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
index 912790ea91a..5ec2df4c218 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfClass.fir.txt
@@ -1,4 +1,6 @@
 public open class TypeParameterOfClass<T> : R|kotlin/Any| {
     public open operator fun foo(comparator: R|ft<java/util/Comparator<ft<T, T?>>, java/util/Comparator<ft<T, T?>>?>|!): R|kotlin/Unit|
 
+    public constructor<T>(): R|test/TypeParameterOfClass<T>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
index 76f2d42d00a..f5f3d4e5ca3 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfMethod.fir.txt
@@ -5,4 +5,6 @@ public open class TypeParameterOfMethod : R|kotlin/Any| {
 
     public open static operator fun <A : R|kotlin/CharSequence|, B : R|kotlin/collections/MutableList<A>|> method(a: R|ft<java/util/Comparator<ft<A, A?>>, java/util/Comparator<ft<A, A?>>?>|!, b: R|ft<B, B?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/TypeParameterOfMethod|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
index 9842a0bece6..ced5f47264c 100644
--- a/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/sam/adapters/TypeParameterOfOuterClass.fir.txt
@@ -1,2 +1,4 @@
 public open class TypeParameterOfOuterClass<T> : R|kotlin/Any| {
+    public constructor<T>(): R|test/TypeParameterOfOuterClass<T>|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
index 501d48c8a90..e4a04ff7bfc 100644
--- a/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signatureAnnotations/StableName.fir.txt
@@ -1,4 +1,6 @@
 public open class StableName : R|kotlin/Any| {
     public open operator fun connect(@R|kotlin/annotations/jvm/internal/ParameterName|(String(host)) host: R|ft<kotlin/String, kotlin/String?>|!): R|kotlin/Unit|
 
+    public constructor(): R|test/StableName|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
index 8e224549fe5..95152838b50 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperType.fir.txt
@@ -1,2 +1,4 @@
 public open class RawSuperType : R|kotlin/Any| {
+    public constructor(): R|test/RawSuperType|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
index d179e41510b..4a6ceb6190f 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithBound.fir.txt
@@ -1,2 +1,4 @@
 public open class RawSuperTypeWithBound : R|kotlin/Any| {
+    public constructor(): R|test/RawSuperTypeWithBound|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
index 4ff6f359c17..094b75ee727 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBound.fir.txt
@@ -1,2 +1,4 @@
 public open class RawSuperTypeWithRecursiveBound : R|kotlin/Any| {
+    public constructor(): R|test/RawSuperTypeWithRecursiveBound|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
index c9d9de7ce5a..6baed087d34 100644
--- a/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/signaturePropagation/RawSuperTypeWithRecursiveBoundMultipleParameters.fir.txt
@@ -1,2 +1,4 @@
 public open class RawSuperTypeWithRecursiveBoundMultipleParameters : R|kotlin/Any| {
+    public constructor(): R|test/RawSuperTypeWithRecursiveBoundMultipleParameters|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt
index b30d87f31a1..95776bde8ef 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyInnerClass.fir.txt
@@ -1,2 +1,4 @@
 public open class DeeplyInnerClass : R|kotlin/Any| {
+    public constructor(): R|test/DeeplyInnerClass|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt
index 64eeab16656..801f8143c56 100644
--- a/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/DeeplyNestedStatic.fir.txt
@@ -1,2 +1,4 @@
 public open class DeeplyNestedStatic : R|kotlin/Any| {
+    public constructor(): R|test/DeeplyNestedStatic|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt b/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt
index 6c423d6f72f..20600fe93b8 100644
--- a/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/InnerClass.fir.txt
@@ -1,2 +1,4 @@
 public open class InnerClass : R|kotlin/Any| {
+    public constructor(): R|test/InnerClass|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt
index a620e3500be..169de0a6581 100644
--- a/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/Simple.fir.txt
@@ -3,4 +3,6 @@ public open class Simple : R|kotlin/Any| {
 
     public open operator fun foo(): R|kotlin/Unit|
 
+    public constructor(): R|test/Simple|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
index 9b89d6841ce..6148f923e95 100644
--- a/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/static/StaticFinal.fir.txt
@@ -11,4 +11,6 @@ public open class StaticFinal : R|kotlin/Any| {
 
     private final static field privateNull: R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|test/StaticFinal|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
index 518df13de87..348ee86f7b8 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargInt.fir.txt
@@ -1,4 +1,6 @@
 public open class VarargInt : R|kotlin/Any| {
     public open operator fun vararg(vararg p: R|kotlin/IntArray|): R|kotlin/Unit|
 
+    public constructor(): R|test/VarargInt|
+
 }
diff --git a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
index 681e33013a2..f338636dac8 100644
--- a/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
+++ b/compiler/testData/loadJava/compiledJava/vararg/VarargString.fir.txt
@@ -1,4 +1,6 @@
 public open class VarargString : R|kotlin/Any| {
     public open operator fun vararg(vararg strings: R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|): R|kotlin/Unit|
 
+    public constructor(): R|test/VarargString|
+
 }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
index 99076db4d13..5740ad86a21 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedJava/extraDump.java.txt
@@ -1,4 +1,6 @@
 public open class Annotated : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
 
+    public constructor(): R|Annotated|
+
 }
diff --git a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
index 0b618b1ca2c..61e1902cfa6 100644
--- a/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithAnnotatedOverriddenJava/extraDump.java.txt
@@ -1,8 +1,12 @@
 public open class Annotated : R|kotlin/Any| {
     @R|org/jetbrains/annotations/NotNull|() public open operator fun foo(@R|org/jetbrains/annotations/Nullable|() param: R|kotlin/String|?): R|kotlin/String|
 
+    public constructor(): R|Annotated|
+
 }
 public open class AnnotatedDerived : R|Annotated| {
     public open operator fun foo(param: R|kotlin/String|?): R|kotlin/String|
 
+    public constructor(): R|AnnotatedDerived|
+
 }
diff --git a/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt
index a270c7928da..cc9d26f4ecb 100644
--- a/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithJava/extraDump.java.txt
@@ -1,2 +1,4 @@
 public open class Some : R|kotlin/Any| {
+    public constructor(): R|Some|
+
 }
diff --git a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
index 02343d01a30..b1c1a707ec5 100644
--- a/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithJavaFakeOverride/extraDump.java.txt
@@ -1,4 +1,6 @@
 public open class A<T> : R|kotlin/Any| {
     public open operator fun foo(t: R|ft<T, T?>|!): R|ft<T, T?>|!
 
+    public constructor<T>(): R|A<T>|
+
 }
diff --git a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
index a57ef10eddc..0478e3691f5 100644
--- a/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/basicWithPrimitiveJava/extraDump.java.txt
@@ -3,4 +3,6 @@ public open class Some : R|kotlin/Any| {
 
     public open operator fun bar(arr: R|kotlin/IntArray|): R|kotlin/Array<ft<kotlin/String, kotlin/String?>>|
 
+    public constructor(): R|Some|
+
 }
diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt
index 9a8f201d2da..3e8d9de1fbe 100644
--- a/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaGetPrefixConflict/extraDump.java.txt
@@ -3,4 +3,6 @@ public open class JavaClass : R|kotlin/Any| {
 
     public open operator fun getText(param: R|ft<kotlin/String, kotlin/String?>|!): R|ft<kotlin/String, kotlin/String?>|!
 
+    public constructor(): R|JavaClass|
+
 }
diff --git a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt
index 2ee624b14c0..1679a54e774 100644
--- a/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt
+++ b/idea/testData/fir/multiModule/javaGetPrefixConflict/jvm/Test.txt
@@ -1,7 +1,7 @@
 FILE: Test.kt
     public final fun test(): R|kotlin/Unit| {
-        lval jc: <ERROR TYPE REF: Unresolved name: JavaClass> = <Unresolved name: JavaClass>#()
-        lval result: <ERROR TYPE REF: Unresolved name: text> = R|<local>/jc|.<Unresolved name: text>#
+        lval jc: R|JavaClass| = R|/JavaClass.JavaClass|()
+        lval result: R|ft<kotlin/String, kotlin/String?>|! = R|<local>/jc|.R|/JavaClass.text|
     }
     public final fun otherTest(jc: R|JavaClass|): R|kotlin/Unit| {
         lval result: R|ft<kotlin/String, kotlin/String?>|! = R|<local>/jc|.R|/JavaClass.text|
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt
index 35b1fe31816..404646a3242 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinExtension/extraDump.java.txt
@@ -1,4 +1,6 @@
 public open class Inheritor : R|Second| {
     public open operator fun R|First|.foo(first: R|kotlin/String|, s: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor(): R|Inheritor|
+
 }
diff --git a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt
index 1299237d459..a383c8091eb 100644
--- a/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaInheritsKotlinProperty/extraDump.java.txt
@@ -1,4 +1,6 @@
 public open class Inheritor : R|kotlin/Any|, R|Base| {
     public open operator fun getX(): R|kotlin/Int|
 
+    public constructor(): R|Inheritor|
+
 }
diff --git a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt
index 6201ad2cb71..0be649d3908 100644
--- a/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/javaInheritsRawKotlin/extraDump.java.txt
@@ -1,4 +1,6 @@
 public open class Some : R|kotlin/Any|, R|Strange<*>| {
     public open operator fun foo(): R|kotlin/Any|
 
+    public constructor(): R|Some|
+
 }
diff --git a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
index 0bf4eff6aa8..681260b81dc 100644
--- a/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
+++ b/idea/testData/fir/multiModule/overrideWithJava/extraDump.java.txt
@@ -3,4 +3,6 @@ public open class A : R|kotlin/Any| {
 
     public open operator fun bar(): R|ft<A, A?>|!
 
+    public constructor(): R|A|
+
 }