From 8a6c9a6aec7f4d634add3fef83de433eaf90082e Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Tue, 2 Apr 2019 15:50:52 +0300
Subject: [PATCH] FIR deserializer: read nullability & add constructors

---
 .../deserialization/ClassDeserialization.kt   |  15 +++
 .../deserialization/FirMemberDeserializer.kt  |  40 +++++-
 .../deserialization/FirTypeDeserializer.kt    |   2 +-
 .../testData/builtIns/kotlin-collections.txt  |  16 +++
 .../testData/builtIns/kotlin-ranges.txt       |  42 +++++-
 .../fir/resolve/testData/builtIns/kotlin.txt  | 120 +++++++++++++++++-
 .../annotations/AnnotatedAnnotation.txt       |   2 +
 .../annotations/AnnotatedMethod.txt           |   2 +
 .../AnnotationInAnnotationArguments.txt       |  10 ++
 .../annotations/ClassLiteralArguments.txt     |   4 +
 .../EnumArgumentWithCustomToString.txt        |   8 ++
 .../MultiDimensionalArrayMethod.txt           |   2 +
 .../annotations/PrimitiveArrayArguments.txt   |   4 +
 .../annotations/SimpleAnnotation.txt          |   2 +
 .../annotations/TargetedAnnotation.txt        |   2 +
 .../classMembers/ClassObjectPropertyField.txt |   6 +
 .../annotations/classMembers/Constructor.txt  |   4 +
 .../classMembers/DelegatedProperty.txt        |   4 +
 .../annotations/classMembers/EnumArgument.txt |   4 +
 .../annotations/classMembers/EnumEntry.txt    |   6 +
 .../annotations/classMembers/Function.txt     |   4 +
 .../annotations/classMembers/Getter.txt       |   4 +
 ...enConstructorWithInlineClassParameters.txt |  16 ++-
 .../classMembers/PropertyField.txt            |   4 +
 ...dApiAnnotationOnInlineClassCosntructor.txt |   4 +-
 .../annotations/classMembers/Setter.txt       |   4 +
 .../classes/AnnotationInClassObject.txt       |  12 ++
 .../classes/ClassInClassObject.txt            |   8 ++
 .../annotations/classes/ClassObject.txt       |   6 +
 .../ClassObjectInStaticNestedClass.txt        |   6 +
 .../annotations/classes/DataClass.txt         |   4 +-
 .../annotations/classes/Deprecated.txt        |   8 ++
 .../classes/DollarsInAnnotationName.txt       |   8 ++
 .../annotations/classes/EnumArgument.txt      |  10 ++
 .../classes/MultipleAnnotations.txt           |   8 ++
 .../annotations/classes/NestedAnnotation.txt  |   6 +
 .../annotations/classes/NestedClass.txt       |   8 ++
 .../annotations/classes/Retention.txt         |   2 +
 .../annotations/classes/Simple.txt            |   4 +
 .../annotations/classes/WithArgument.txt      |  18 +++
 .../classes/WithMultipleArguments.txt         |   4 +
 .../packageMembers/DelegatedProperty.txt      |   2 +
 .../packageMembers/EnumArgument.txt           |   2 +
 .../packageMembers/EnumArrayArgument.txt      |   2 +
 .../annotations/packageMembers/Function.txt   |   2 +
 .../annotations/packageMembers/Getter.txt     |   2 +
 .../packageMembers/PropertyField.txt          |   2 +
 .../annotations/packageMembers/Setter.txt     |   2 +
 .../packageMembers/StringArrayArgument.txt    |   2 +
 .../annotations/parameters/Constructor.txt    |   6 +
 .../parameters/EnumConstructor.txt            |   6 +
 .../parameters/ExtensionFunction.txt          |   2 +
 .../parameters/ExtensionFunctionInClass.txt   |   4 +
 .../parameters/ExtensionPropertySetter.txt    |   4 +
 .../parameters/FunctionInClass.txt            |   4 +
 .../parameters/FunctionInTrait.txt            |   2 +
 .../parameters/InnerClassConstructor.txt      |   8 ++
 .../parameters/ManyAnnotations.txt            |   8 ++
 .../parameters/PropertySetterInClass.txt      |   4 +
 .../parameters/TopLevelFunction.txt           |   2 +
 .../parameters/TopLevelPropertySetter.txt     |   4 +
 .../propertiesWithoutBackingFields/Class.txt  |   4 +
 .../ClassObject.txt                           |   6 +
 .../ExtensionsWithSameNameClass.txt           |   8 ++
 .../ExtensionsWithSameNamePackage.txt         |   6 +
 .../NestedTrait.txt                           |   4 +
 .../TopLevel.txt                              |   2 +
 .../propertiesWithoutBackingFields/Trait.txt  |   2 +
 .../TraitClassObject.txt                      |   4 +
 .../types/ClassLiteralArgument.txt            |  12 ++
 .../annotations/types/ReceiverParameter.txt   |   2 +
 .../types/SimpleTypeAnnotation.txt            |   4 +
 .../annotations/types/SourceRetention.txt     |   4 +
 .../annotations/types/SupertypesAndBounds.txt |   2 +
 .../types/TypeAnnotationWithArguments.txt     |   4 +
 .../annotations/types/TypeArgument.txt        |   2 +
 .../types/TypeParameterAnnotation.txt         |   4 +
 .../TypeParameterAnnotationWithArguments.txt  |   4 +
 .../withUseSiteTarget/DelegateTarget.txt      |   8 +-
 .../withUseSiteTarget/FieldTarget.txt         |   4 +
 .../withUseSiteTarget/PropertyAndAccessor.txt |   4 +
 .../withUseSiteTarget/ReceiverTarget.txt      |   4 +
 .../loadCompiledKotlin/class/Class.txt        |   2 +
 .../loadCompiledKotlin/class/ClassInParam.txt |   2 +
 .../class/ClassInnerClass.txt                 |   4 +
 .../class/ClassMemberConflict.txt             |  20 +++
 .../class/ClassOutParam.txt                   |   2 +
 .../loadCompiledKotlin/class/ClassParam.txt   |   2 +
 .../class/ClassParamReferencesParam.txt       |   2 +
 .../class/ClassParamReferencesParam2.txt      |   2 +
 .../class/ClassParamReferencesSelf.txt        |   2 +
 .../class/ClassParamUpperClassBound.txt       |   2 +
 .../ClassParamUpperClassInterfaceBound.txt    |   2 +
 .../class/ClassParamUpperInterfaceBound.txt   |   2 +
 .../class/ClassTwoParams.txt                  |   2 +
 .../class/ClassTwoParams2.txt                 |   2 +
 .../EnumWithGenericConstructorParameter.txt   |   2 +
 .../EnumWithPrimitiveConstructorParameter.txt |   2 +
 .../class/InheritClassSimple.txt              |   4 +
 .../class/InheritClassWithParam.txt           |   4 +
 .../class/InheritSubstitutedMethod.txt        |   2 +
 .../class/InheritTraitWithFunctionParam.txt   |   2 +
 .../class/InheritTraitWithParam.txt           |   2 +
 .../class/InnerClassExtendInnerClass.txt      |   6 +
 .../class/InnerGenericClass.txt               |   4 +
 .../loadCompiledKotlin/class/InnerTypes.txt   |   8 ++
 .../loadCompiledKotlin/class/NamedObject.txt  |   2 +
 .../class/NamedObjectInClass.txt              |   4 +
 .../class/NamedObjectInClassObject.txt        |   6 +
 .../class/NamedObjectInNamedObject.txt        |   4 +
 ...NamedObjectWithAnotherTopLevelProperty.txt |   2 +
 .../loadCompiledKotlin/class/NestedClass.txt  |   4 +
 .../class/NestedClassExtendNestedClass.txt    |   6 +
 .../class/NestedGenericClass.txt              |   4 +
 .../javaBean/DifferentGetterAndSetter.txt     |   4 +-
 .../class/javaBean/JavaBeanVal.txt            |   4 +-
 .../class/javaBean/JavaBeanVar.txt            |   6 +-
 .../javaBean/JavaBeanVarOfGenericType.txt     |   6 +-
 .../class/javaBean/TwoSetters.txt             |   4 +-
 .../classFun/ClassInParamUsedInFun.txt        |   2 +
 .../classFun/ClassParamUsedInFun.txt          |   2 +
 .../classFun/FunDelegationToTraitImpl.txt     |   2 +
 .../classFun/FunInParamSuper.txt              |   4 +
 .../classObject/ClassObjectDeclaresVal.txt    |   4 +
 .../classObject/ClassObjectDeclaresVar.txt    |   4 +
 .../ClassObjectDefaultVisibility.txt          |  30 +++++
 .../ClassObjectExplicitVisibility.txt         |  36 ++++++
 .../classObject/ClassObjectExtendsTrait.txt   |   4 +
 .../ClassObjectExtendsTraitWithTP.txt         |   4 +
 .../ClassObjectInClassStaticFields.txt        |   4 +
 .../ClassObjectInTraitStaticFields.txt        |   2 +
 .../ClassObjectPropertyInClass.txt            |   4 +
 .../classObject/Delegation.txt                |   4 +
 .../classObject/InnerClassInClassObject.txt   |   8 ++
 .../classObject/NamedClassObject.txt          |   4 +
 .../classObject/SimpleClassObject.txt         |   4 +
 .../constructor/Constructor0.txt              |   2 +
 .../constructor/Constructor1.txt              |   2 +
 .../Constructor1WithParamDefaultValue.txt     |   2 +
 .../Constructor2WithOneParamDefaultValue.txt  |   2 +
 .../ConstructorCollectionParameter.txt        |   2 +
 .../constructor/ConstructorGenericDeep.txt    |   2 +
 .../constructor/ConstructorGenericSimple.txt  |   2 +
 .../ConstructorGenericUpperBound.txt          |   2 +
 .../constructor/ConstructorWithTwoDefArgs.txt |   2 +
 .../ConstructorWithTwoTypeParameters.txt      |   2 +
 ...oTypeParametersAndOneIntValueParameter.txt |   2 +
 ...TwoTypeParametersAndOnePValueParameter.txt |   2 +
 .../ConstructorWithTypeParameter.txt          |   2 +
 ...thTypeParametersEAndOnePValueParameter.txt |   2 +
 .../InnerClassConstructorWithDefArgs.txt      |   4 +
 ...ivateConstructor1WithParamDefaultValue.txt |   2 +
 .../vararg/ConstructorNonLastVararg.txt       |   2 +
 .../constructor/vararg/ConstructorVararg.txt  |   2 +
 .../loadCompiledKotlin/coroutines/Basic.txt   |   2 +
 .../dataClass/MixedComponents.txt             |   4 +-
 .../loadCompiledKotlin/dataClass/OneVal.txt   |   4 +-
 .../loadCompiledKotlin/dataClass/TwoVals.txt  |   4 +-
 .../loadCompiledKotlin/dataClass/TwoVars.txt  |   4 +-
 .../enum/EnumVisibility.txt                   |   6 +
 .../enum/EnumWithConstuctor.txt               |   2 +
 .../enum/EnumWithInnerClasses.txt             |   6 +
 .../loadCompiledKotlin/enum/InnerEnum.txt     |   4 +
 .../enum/InnerEnumExistingClassObject.txt     |   6 +
 .../loadCompiledKotlin/enum/SimpleEnum.txt    |   2 +
 .../fromLoadJava/ArrayTypeVariance.txt        |   4 +-
 .../ClassDoesNotOverrideMethod.txt            |   2 +
 .../fromLoadJava/ClassObject.txt              |   2 +
 .../fromLoadJava/ClassObjectAnnotation.txt    |   6 +
 .../fromLoadJava/ClassWithConstVal.txt        |   2 +
 .../fromLoadJava/ClassWithTypeP.txt           |   2 +
 .../ClassWithTypePExtendsIterableP.txt        |   2 +
 .../fromLoadJava/ClassWithTypePP.txt          |   2 +
 .../fromLoadJava/ClassWithTypePRefNext.txt    |   2 +
 .../fromLoadJava/ClassWithTypePRefSelf.txt    |   2 +
 .../ClassWithTypePRefSelfAndClass.txt         |   2 +
 .../loadCompiledKotlin/fromLoadJava/Enum.txt  |   2 +
 .../fromLoadJava/FieldAsVar.txt               |   2 +
 .../fromLoadJava/FieldOfArrayType.txt         |   2 +
 .../fromLoadJava/FinalFieldAsVal.txt          |   2 +
 .../InheritMethodsDifferentReturnTypes.txt    |  10 +-
 ...eritMethodsDifferentReturnTypesGeneric.txt |   2 +
 .../fromLoadJava/InnerClass.txt               |   4 +
 .../fromLoadJava/MethodTypePOneUpperBound.txt |   2 +
 .../MethodTypePTwoUpperBounds.txt             |   2 +
 .../fromLoadJava/MethodWithTypeP.txt          |   2 +
 .../fromLoadJava/MethodWithTypePP.txt         |   2 +
 .../fromLoadJava/MethodWithTypePRefClassP.txt |   2 +
 .../fromLoadJava/MethosWithPRefTP.txt         |   2 +
 .../fromLoadJava/MyException.txt              |   2 +
 .../fromLoadJava/NestedClass.txt              |   4 +
 .../fromLoadJava/ObjectInClass.txt            |   4 +
 .../fromLoadJava/ObjectMembers.txt            |   2 +
 .../fromLoadJava/PackageLevelObject.txt       |   2 +
 .../RemoveRedundantProjectionKind.txt         |   4 +-
 .../fromLoadJava/Simple.txt                   |   2 +
 .../fromLoadJava/TwoFields.txt                |   2 +
 .../fromLoadJava/UnboundWildcard.txt          |   4 +-
 .../kotlinSignature/AllBoundsInWhen.txt       |   2 +
 .../kotlinSignature/ArrayType.txt             |   2 +
 .../ConstructorWithNewTypeParams.txt          |   2 +
 .../ConstructorWithParentTypeParams.txt       |   2 +
 .../ConstructorWithSeveralParams.txt          |   2 +
 .../ConstructorWithoutParams.txt              |   2 +
 .../kotlinSignature/CustomProjectionKind.txt  |   2 +
 .../MethodWithFunctionTypes.txt               |   4 +-
 .../kotlinSignature/MethodWithGenerics.txt    |   2 +
 .../MethodWithMappedClasses.txt               |   2 +
 .../MethodWithTypeParameters.txt              |   2 +
 .../kotlinSignature/MethodWithVararg.txt      |   2 +
 .../kotlinSignature/PropertyArrayTypes.txt    |   2 +
 .../kotlinSignature/PropertyComplexTypes.txt  |   2 +
 .../kotlinSignature/PropertySimpleType.txt    |   2 +
 .../kotlinSignature/StarProjection.txt        |   2 +
 .../error/AddingNullability.txt               |   2 +
 .../error/ConflictingProjectionKind.txt       |   4 +-
 .../error/ExplicitFieldGettersAndSetters.txt  |   2 +
 .../kotlinSignature/error/ExtraUpperBound.txt |   4 +-
 .../error/MissingUpperBound.txt               |   4 +-
 .../kotlinSignature/error/NoFieldTypeRef.txt  |   2 +
 .../error/NotVarargReplacedWithVararg.txt     |   4 +-
 .../error/RedundantProjectionKind.txt         |   2 +
 .../error/ReturnTypeMissing.txt               |   4 +-
 .../kotlinSignature/error/SyntaxError.txt     |   4 +-
 .../error/SyntaxErrorInFieldAnnotation.txt    |   2 +
 .../error/VarargReplacedWithNotVararg.txt     |   2 +
 .../error/WrongFieldInitializer.txt           |   2 +
 .../error/WrongFieldMutability.txt            |   2 +
 .../kotlinSignature/error/WrongFieldName.txt  |   2 +
 .../kotlinSignature/error/WrongMethodName.txt |   4 +-
 .../error/WrongProjectionKind.txt             |   4 +-
 .../error/WrongReturnTypeStructure.txt        |   4 +-
 .../kotlinSignature/error/WrongTypeName1.txt  |   4 +-
 .../kotlinSignature/error/WrongTypeName2.txt  |   4 +-
 .../kotlinSignature/error/WrongTypeName3.txt  |   4 +-
 .../WrongTypeParameterBoundStructure1.txt     |   4 +-
 .../WrongTypeParameterBoundStructure2.txt     |   4 +-
 .../error/WrongTypeParametersCount.txt        |   4 +-
 .../error/WrongValueParameterStructure1.txt   |   4 +-
 .../error/WrongValueParameterStructure2.txt   |   4 +-
 .../error/WrongValueParametersCount.txt       |   4 +-
 .../parameter/InheritNotVararg.txt            |   4 +-
 .../parameter/InheritNotVarargInteger.txt     |   4 +-
 .../parameter/InheritNotVarargPrimitive.txt   |   4 +-
 .../propagation/parameter/Kt3302.txt          |   4 +-
 .../parameter/NullableToNotNull.txt           |   4 +-
 .../NullableToNotNullKotlinSignature.txt      |   4 +-
 .../return/AddNotNullJavaSubtype.txt          |   2 +-
 .../return/AddNotNullSameJavaType.txt         |   2 +-
 .../propagation/return/SameProjectionKind.txt |   4 +-
 .../return/SubclassFromGenericAndNot.txt      |   2 +-
 .../TwoSuperclassesReturnJavaSubtype.txt      |   2 +-
 .../TwoSuperclassesReturnSameJavaType.txt     |   2 +-
 .../TwoSuperclassesSupplementNotNull.txt      |   2 +-
 .../fromLoadJava/library/LoadIterable.txt     |   4 +-
 .../fromLoadJava/library/LoadIterator.txt     |   4 +-
 .../fromLoadJava/library/Max.txt              |   4 +-
 .../modality/ModalityOfFakeOverrides.txt      |   2 +
 .../fromLoadJava/notNull/NotNullField.txt     |   2 +
 .../fromLoadJava/notNull/NotNullIntArray.txt  |   2 +
 .../fromLoadJava/notNull/NotNullMethod.txt    |   2 +
 .../notNull/NotNullObjectArray.txt            |   2 +
 .../fromLoadJava/notNull/NotNullParameter.txt |   2 +
 .../fun/DeclaredMemberOverridesDelegated.txt  |   2 +
 .../loadCompiledKotlin/fun/InfixKeyword.txt   |   2 +
 .../fun/OperatorKeyword.txt                   |   2 +
 .../fun/PropagateDeepSubclass.txt             |   4 +
 .../fun/PropagateSubclassOfComparable.txt     |   2 +
 .../FunParamNullable.txt                      |   2 +-
 .../fun/nonGeneric/ClassFun.txt               |   2 +
 .../fun/nonGeneric/ClassFunGetFoo.txt         |   2 +
 .../fun/nonGeneric/ClassFunGetFooSetFoo.txt   |   2 +
 .../fun/nonGeneric/ClassFunSetFoo.txt         |   2 +
 .../fun/nonGeneric/ExtFun.txt                 |   1 -
 .../fun/nonGeneric/ExtFunInClass.txt          |   2 +
 .../fun/nonGeneric/ModifierAbstract.txt       |   2 +
 .../fun/nonGeneric/ModifierOpen.txt           |   2 +
 .../fun/nonGeneric/ReturnTypeNullable.txt     |   2 +-
 .../fun/vararg/VarargInt.txt                  |   2 +
 .../fun/vararg/VarargString.txt               |   2 +
 .../memberOrder/CallablesNameClash.txt        |   2 +
 .../memberOrder/EnumEntries.txt               |   2 +
 .../memberOrder/ExtensionMembers.txt          |   2 +
 .../ExtensionPropertiesNameClash.txt          |   2 +
 .../memberOrder/InnerClasses.txt              |  10 ++
 .../nested/DeepInnerGeneric.txt               |   8 ++
 .../nested/InnerClassReferencesOuterTP.txt    |   4 +
 .../nested/MembersReferenceOuterTP.txt        |   4 +
 .../platformTypes/NotnullTypeArgument.txt     |   2 +
 .../platformTypes/NullableTypeArgument.txt    |   2 +
 .../loadCompiledKotlin/prop/ClassVal.txt      |   2 +
 .../prop/ClassValAbstract.txt                 |   2 +
 .../loadCompiledKotlin/prop/ClassVar.txt      |   2 +
 .../loadCompiledKotlin/prop/Const.txt         |   6 +
 .../loadCompiledKotlin/prop/ExtValInClass.txt |   2 +
 .../prop/ExtValIntListQOfIntInClass.txt       |   2 +
 .../prop/ExtValIntTInClass.txt                |   2 +
 .../prop/ExtValIntTQInClass.txt               |   2 +
 .../prop/ExtValTIntInClass.txt                |   2 +
 .../loadCompiledKotlin/prop/ExtVarInClass.txt |   2 +
 .../prop/ExtVarIntTInClass.txt                |   2 +
 .../prop/ExtVarIntTQInClass.txt               |   2 +
 .../prop/ExtVarTIntInClass.txt                |   2 +
 .../prop/ExtVarTQIntInClass.txt               |   2 +
 .../NonConstValWithConstantValueAttribute.txt |   6 +
 .../prop/OverrideClassVal.txt                 |   4 +
 .../prop/OverrideTraitVal.txt                 |   2 +
 .../prop/PropFromSuperclass.txt               |   4 +
 .../prop/VarDelegationToTraitImpl.txt         |   2 +
 .../prop/VarWithDelegated.txt                 |   4 +
 .../prop/defaultAccessors/ClassVal.txt        |   2 +
 .../prop/defaultAccessors/ClassValParams.txt  |   2 +
 .../prop/defaultAccessors/ClassValWithGet.txt |   2 +
 .../prop/defaultAccessors/ClassVar.txt        |   2 +
 .../defaultAccessors/ClassVarModality.txt     |   4 +
 .../prop/defaultAccessors/ClassVarParams.txt  |   2 +
 .../prop/defaultAccessors/ClassVarWithGet.txt |   2 +
 .../prop/defaultAccessors/ClassVarWithSet.txt |   2 +
 .../testData/loadCompiledKotlin/type/AnyQ.txt |   2 +-
 .../testData/loadCompiledKotlin/type/IntQ.txt |   2 +-
 .../loadCompiledKotlin/type/JlIntegerQ.txt    |   2 +-
 .../loadCompiledKotlin/type/JlObjectQ.txt     |   2 +-
 .../loadCompiledKotlin/type/JlStringQ.txt     |   2 +-
 .../loadCompiledKotlin/type/NothingQ.txt      |   2 +-
 .../loadCompiledKotlin/type/Platform.txt      |   6 +-
 .../loadCompiledKotlin/type/StringQ.txt       |   2 +-
 .../type/SuspendFunction.txt                  |   1 -
 .../typealias/Annotations.txt                 |   2 +
 .../typealias/TypeAliasToExtension.txt        |   2 +
 .../visibility/InternalClass.txt              |   2 +
 .../visibility/InternalConstructor.txt        |   2 +
 .../visibility/PrivateClass.txt               |   2 +
 .../visibility/PrivateClassMembers.txt        |   2 +
 .../visibility/PrivateToThis.txt              |   2 +
 .../visibility/PropertyInConstructor.txt      |   4 +
 ...ropertyInConstructorExplicitVisibility.txt |   4 +
 336 files changed, 1321 insertions(+), 96 deletions(-)

diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
index 92c54479df4..20d1b250e1e 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/ClassDeserialization.kt
@@ -10,6 +10,8 @@ import org.jetbrains.kotlin.fir.declarations.impl.FirClassImpl
 import org.jetbrains.kotlin.fir.declarations.impl.FirTypeParameterImpl
 import org.jetbrains.kotlin.fir.symbols.impl.FirClassSymbol
 import org.jetbrains.kotlin.fir.symbols.impl.FirTypeParameterSymbol
+import org.jetbrains.kotlin.fir.types.impl.ConeClassTypeImpl
+import org.jetbrains.kotlin.fir.types.impl.ConeTypeParameterTypeImpl
 import org.jetbrains.kotlin.fir.types.impl.FirResolvedTypeRefImpl
 import org.jetbrains.kotlin.metadata.ProtoBuf
 import org.jetbrains.kotlin.metadata.deserialization.Flags
@@ -69,6 +71,19 @@ fun deserializeClassToSymbol(
         // TODO: properties
         declarations += classProto.functionList.map(classDeserializer::loadFunction)
 
+        val delegatedSelfType = FirResolvedTypeRefImpl(
+            session,
+            null,
+            ConeClassTypeImpl(
+                symbol.toLookupTag(),
+                typeParameters.map { ConeTypeParameterTypeImpl(it.symbol, false) }.toTypedArray(),
+                false
+            ),
+            isMarkedNullable = false,
+            annotations = emptyList()
+        )
+        declarations += classProto.constructorList.map { classDeserializer.loadConstructor(it, delegatedSelfType) }
+
         declarations += classProto.nestedClassNameList.mapNotNull { nestedNameId ->
             val nestedClassId = classId.createNestedClassId(Name.identifier(nameResolver.getString(nestedNameId)))
             deserializeNestedClass(nestedClassId, context)?.fir
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
index c4669792304..142e12fc02a 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirMemberDeserializer.kt
@@ -7,11 +7,10 @@ package org.jetbrains.kotlin.fir.deserialization
 
 import org.jetbrains.kotlin.descriptors.annotations.Annotations
 import org.jetbrains.kotlin.fir.FirSession
+import org.jetbrains.kotlin.fir.declarations.FirConstructor
 import org.jetbrains.kotlin.fir.declarations.FirNamedFunction
 import org.jetbrains.kotlin.fir.declarations.FirValueParameter
-import org.jetbrains.kotlin.fir.declarations.impl.FirMemberFunctionImpl
-import org.jetbrains.kotlin.fir.declarations.impl.FirTypeParameterImpl
-import org.jetbrains.kotlin.fir.declarations.impl.FirValueParameterImpl
+import org.jetbrains.kotlin.fir.declarations.impl.*
 import org.jetbrains.kotlin.fir.expressions.FirAnnotationCall
 import org.jetbrains.kotlin.fir.symbols.CallableId
 import org.jetbrains.kotlin.fir.symbols.impl.FirFunctionSymbol
@@ -160,6 +159,41 @@ class FirMemberDeserializer(private val c: FirDeserializationContext) {
         }
     }
 
+    fun loadConstructor(proto: ProtoBuf.Constructor, delegatedSelfType: FirTypeRef): FirConstructor {
+        val flags = proto.flags
+        val relativeClassName = c.relativeClassName!!
+        val symbol = FirFunctionSymbol(CallableId(c.packageFqName, relativeClassName, relativeClassName.shortName()))
+        val local = c.childContext(emptyList())
+        val isPrimary = !Flags.IS_SECONDARY.get(flags)
+        return if (isPrimary) {
+            FirPrimaryConstructorImpl(
+                c.session,
+                null,
+                symbol,
+                ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
+                Flags.IS_EXPECT_FUNCTION.get(flags),
+                false,
+                delegatedSelfType,
+                null
+            )
+        } else {
+            FirConstructorImpl(
+                c.session,
+                null,
+                symbol,
+                ProtoEnumFlags.visibility(Flags.VISIBILITY.get(flags)),
+                Flags.IS_EXPECT_FUNCTION.get(flags),
+                false,
+                delegatedSelfType,
+                null
+            )
+        }.apply {
+            valueParameters += local.memberDeserializer.valueParameters(proto.valueParameterList)
+            annotations += getAnnotations(proto, flags, AnnotatedCallableKind.FUNCTION)
+        }
+
+    }
+
     private fun createTypeParameterSymbol(name: Name): FirTypeParameterSymbol {
         val firSymbol = FirTypeParameterSymbol()
         FirTypeParameterImpl(c.session, null, firSymbol, name, variance = Variance.INVARIANT, isReified = false)
diff --git a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
index 4c51a9c35f9..ef9858e9846 100644
--- a/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
+++ b/compiler/fir/resolve/src/org/jetbrains/kotlin/fir/deserialization/FirTypeDeserializer.kt
@@ -90,7 +90,7 @@ class FirTypeDeserializer(
             //createSuspendFunctionType(annotations, constructor, arguments, proto.nullable)
             ConeClassErrorType("createSuspendFunctionType not supported")
         } else {
-            ConeClassTypeImpl(constructor, arguments, isNullable = false)
+            ConeClassTypeImpl(constructor, arguments, isNullable = proto.nullable)
         }
 
         val abbreviatedTypeProto = proto.abbreviatedType(typeTable) ?: return simpleType
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
index fd5298fbfd4..b8b87a94734 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-collections.txt
@@ -3,6 +3,8 @@ public abstract class BooleanIterator : R|kotlin/collections/Iterator<kotlin/Boo
 
     public abstract fun nextBoolean(): R|kotlin/Boolean|
 
+    public constructor()
+
 }
 
 public abstract class ByteIterator : R|kotlin/collections/Iterator<kotlin/Byte>| {
@@ -10,6 +12,8 @@ public abstract class ByteIterator : R|kotlin/collections/Iterator<kotlin/Byte>|
 
     public abstract fun nextByte(): R|kotlin/Byte|
 
+    public constructor()
+
 }
 
 public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>| {
@@ -17,6 +21,8 @@ public abstract class CharIterator : R|kotlin/collections/Iterator<kotlin/Char>|
 
     public abstract fun nextChar(): R|kotlin/Char|
 
+    public constructor()
+
 }
 
 <E> public abstract interface Collection : R|kotlin/collections/Iterable<E>| {
@@ -35,6 +41,8 @@ public abstract class DoubleIterator : R|kotlin/collections/Iterator<kotlin/Doub
 
     public abstract fun nextDouble(): R|kotlin/Double|
 
+    public constructor()
+
 }
 
 public abstract class FloatIterator : R|kotlin/collections/Iterator<kotlin/Float>| {
@@ -42,6 +50,8 @@ public abstract class FloatIterator : R|kotlin/collections/Iterator<kotlin/Float
 
     public abstract fun nextFloat(): R|kotlin/Float|
 
+    public constructor()
+
 }
 
 public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
@@ -49,6 +59,8 @@ public abstract class IntIterator : R|kotlin/collections/Iterator<kotlin/Int>| {
 
     public abstract fun nextInt(): R|kotlin/Int|
 
+    public constructor()
+
 }
 
 <T> public abstract interface Iterable : R|kotlin/Any| {
@@ -106,6 +118,8 @@ public abstract class LongIterator : R|kotlin/collections/Iterator<kotlin/Long>|
 
     public abstract fun nextLong(): R|kotlin/Long|
 
+    public constructor()
+
 }
 
 <K, V> public abstract interface Map : R|kotlin/Any| {
@@ -244,5 +258,7 @@ public abstract class ShortIterator : R|kotlin/collections/Iterator<kotlin/Short
 
     public abstract fun nextShort(): R|kotlin/Short|
 
+    public constructor()
+
 }
 
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
index a9c9cf82c2f..50e09a0d54d 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin-ranges.txt
@@ -1,5 +1,5 @@
 public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>| {
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -9,9 +9,13 @@ public open class CharProgression : R|kotlin/collections/Iterable<kotlin/Char>|
 
     public open fun toString(): R|kotlin/String|
 
+    internal constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|, step: R|kotlin/Int|)
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Char|, rangeEnd: R|kotlin/Char|, step: R|kotlin/Int|): R|kotlin/ranges/CharProgression|
 
+        private constructor()
+
     }
 
 }
@@ -21,12 +25,14 @@ internal final class CharProgressionIterator : R|kotlin/collections/CharIterator
 
     public open fun nextChar(): R|kotlin/Char|
 
+    public constructor(first: R|kotlin/Char|, last: R|kotlin/Char|, step: R|kotlin/Int|)
+
 }
 
 public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges/ClosedRange<kotlin/Char>| {
     public open operator fun contains(value: R|kotlin/Char|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -34,7 +40,11 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(start: R|kotlin/Char|, endInclusive: R|kotlin/Char|)
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -47,7 +57,7 @@ public final class CharRange : R|kotlin/ranges/CharProgression|, R|kotlin/ranges
 }
 
 public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -57,9 +67,13 @@ public open class IntProgression : R|kotlin/collections/Iterable<kotlin/Int>| {
 
     public open fun toString(): R|kotlin/String|
 
+    internal constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|, step: R|kotlin/Int|)
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Int|, rangeEnd: R|kotlin/Int|, step: R|kotlin/Int|): R|kotlin/ranges/IntProgression|
 
+        private constructor()
+
     }
 
 }
@@ -69,12 +83,14 @@ internal final class IntProgressionIterator : R|kotlin/collections/IntIterator|
 
     public open fun nextInt(): R|kotlin/Int|
 
+    public constructor(first: R|kotlin/Int|, last: R|kotlin/Int|, step: R|kotlin/Int|)
+
 }
 
 public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/ClosedRange<kotlin/Int>| {
     public open operator fun contains(value: R|kotlin/Int|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -82,13 +98,17 @@ public final class IntRange : R|kotlin/ranges/IntProgression|, R|kotlin/ranges/C
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(start: R|kotlin/Int|, endInclusive: R|kotlin/Int|)
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>| {
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -98,9 +118,13 @@ public open class LongProgression : R|kotlin/collections/Iterable<kotlin/Long>|
 
     public open fun toString(): R|kotlin/String|
 
+    internal constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|, step: R|kotlin/Long|)
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun fromClosedRange(rangeStart: R|kotlin/Long|, rangeEnd: R|kotlin/Long|, step: R|kotlin/Long|): R|kotlin/ranges/LongProgression|
 
+        private constructor()
+
     }
 
 }
@@ -110,12 +134,14 @@ internal final class LongProgressionIterator : R|kotlin/collections/LongIterator
 
     public open fun nextLong(): R|kotlin/Long|
 
+    public constructor(first: R|kotlin/Long|, last: R|kotlin/Long|, step: R|kotlin/Long|)
+
 }
 
 public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges/ClosedRange<kotlin/Long>| {
     public open operator fun contains(value: R|kotlin/Long|): R|kotlin/Boolean|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
@@ -123,7 +149,11 @@ public final class LongRange : R|kotlin/ranges/LongProgression|, R|kotlin/ranges
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(start: R|kotlin/Long|, endInclusive: R|kotlin/Long|)
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/builtIns/kotlin.txt b/compiler/fir/resolve/testData/builtIns/kotlin.txt
index 8dcc3195025..185c9f226c1 100644
--- a/compiler/fir/resolve/testData/builtIns/kotlin.txt
+++ b/compiler/fir/resolve/testData/builtIns/kotlin.txt
@@ -24,20 +24,22 @@ public final fun longArrayOf(vararg elements: R|kotlin/LongArray|): R|kotlin/Lon
 
 public final fun shortArrayOf(vararg elements: R|kotlin/ShortArray|): R|kotlin/ShortArray|
 
-public final operator fun R|kotlin/String|.plus(other: R|kotlin/Any|): R|kotlin/String|
+public final operator fun R|kotlin/String|?.plus(other: R|kotlin/Any|?): R|kotlin/String|
 
-public final fun R|kotlin/Any|.toString(): R|kotlin/String|
+public final fun R|kotlin/Any|?.toString(): R|kotlin/String|
 
 public abstract interface Annotation : R|kotlin/Any| {
 }
 
 public open class Any {
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor()
+
 }
 
 <T> public final class Array : R|kotlin/Any| {
@@ -47,6 +49,8 @@ public open class Any {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|T|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, T>|)
+
 }
 
 public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>| {
@@ -60,7 +64,11 @@ public final class Boolean : R|kotlin/Comparable<kotlin/Boolean>| {
 
     public final infix fun xor(other: R|kotlin/Boolean|): R|kotlin/Boolean|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -72,6 +80,10 @@ public final class BooleanArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Boolean|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Boolean>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>| {
@@ -189,7 +201,11 @@ public final class Byte : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Byte>| {
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -201,6 +217,10 @@ public final class ByteArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Byte|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Byte>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public final class Char : R|kotlin/Comparable<kotlin/Char>| {
@@ -232,7 +252,11 @@ public final class Char : R|kotlin/Comparable<kotlin/Char>| {
 
     public final fun toShort(): R|kotlin/Short|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -244,6 +268,10 @@ public final class CharArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Char|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Char>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public abstract interface CharSequence : R|kotlin/Any| {
@@ -264,9 +292,13 @@ public abstract interface Cloneable : R|kotlin/Any| {
 }
 
 public final annotation class Deprecated : R|kotlin/Annotation| {
+    public constructor(message: R|kotlin/String|, replaceWith: R|kotlin/ReplaceWith|, level: R|kotlin/DeprecationLevel|)
+
 }
 
 public final enum class DeprecationLevel : R|kotlin/Enum<kotlin/DeprecationLevel>| {
+    private constructor()
+
 }
 
 public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>| {
@@ -376,7 +408,11 @@ public final class Double : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Double>
 
     public final operator fun unaryPlus(): R|kotlin/Double|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -388,9 +424,15 @@ public final class DoubleArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Double|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Double>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public final annotation class DslMarker : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 <E> public abstract class Enum : R|kotlin/Comparable<E>| {
@@ -398,18 +440,24 @@ public final annotation class DslMarker : R|kotlin/Annotation| {
 
     public final operator fun compareTo(other: R|E|): R|kotlin/Int|
 
-    public final operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public final operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public final fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(name: R|kotlin/String|, ordinal: R|kotlin/Int|)
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final annotation class ExtensionFunctionType : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>| {
@@ -519,7 +567,11 @@ public final class Float : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Float>|
 
     public final operator fun unaryPlus(): R|kotlin/Float|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -531,6 +583,10 @@ public final class FloatArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Float|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Float>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 <R> public abstract interface Function : R|kotlin/Any| {
@@ -665,7 +721,11 @@ public final class Int : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Int>| {
 
     public final infix fun xor(other: R|kotlin/Int|): R|kotlin/Int|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -677,6 +737,10 @@ public final class IntArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Int>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>| {
@@ -808,7 +872,11 @@ public final class Long : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Long>| {
 
     public final infix fun xor(other: R|kotlin/Long|): R|kotlin/Long|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -820,9 +888,15 @@ public final class LongArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Long|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Long>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public final class Nothing {
+    private constructor()
+
 }
 
 public abstract class Number : R|kotlin/Any| {
@@ -840,15 +914,23 @@ public abstract class Number : R|kotlin/Any| {
 
     public abstract fun toShort(): R|kotlin/Short|
 
+    public constructor()
+
 }
 
 public final annotation class ParameterName : R|kotlin/Annotation| {
+    public constructor(name: R|kotlin/String|)
+
 }
 
 public final annotation class PublishedApi : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class ReplaceWith : R|kotlin/Annotation| {
+    public constructor(expression: R|kotlin/String|, vararg imports: R|kotlin/Array<out kotlin/String>|)
+
 }
 
 public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>| {
@@ -966,7 +1048,11 @@ public final class Short : R|kotlin/Number|, R|kotlin/Comparable<kotlin/Short>|
 
     public final operator fun unaryPlus(): R|kotlin/Int|
 
+    private constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
@@ -978,9 +1064,15 @@ public final class ShortArray : R|kotlin/Any| {
 
     public final operator fun set(index: R|kotlin/Int|, value: R|kotlin/Short|): R|kotlin/Unit|
 
+    public constructor(size: R|kotlin/Int|, init: R|kotlin/Function1<kotlin/Int, kotlin/Short>|)
+
+    public constructor(size: R|kotlin/Int|)
+
 }
 
 public final annotation class SinceKotlin : R|kotlin/Annotation| {
+    public constructor(version: R|kotlin/String|)
+
 }
 
 public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSequence| {
@@ -988,26 +1080,44 @@ public final class String : R|kotlin/Comparable<kotlin/String>|, R|kotlin/CharSe
 
     public open operator fun get(index: R|kotlin/Int|): R|kotlin/Char|
 
-    public final operator fun plus(other: R|kotlin/Any|): R|kotlin/String|
+    public final operator fun plus(other: R|kotlin/Any|?): R|kotlin/String|
 
     public open fun subSequence(startIndex: R|kotlin/Int|, endIndex: R|kotlin/Int|): R|kotlin/CharSequence|
 
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final annotation class Suppress : R|kotlin/Annotation| {
+    public constructor(vararg names: R|kotlin/Array<out kotlin/String>|)
+
 }
 
 public open class Throwable : R|kotlin/Any| {
+    public constructor(message: R|kotlin/String|?)
+
+    public constructor(cause: R|kotlin/Throwable|?)
+
+    public constructor()
+
+    public constructor(message: R|kotlin/String|?, cause: R|kotlin/Throwable|?)
+
 }
 
 public final object Unit : R|kotlin/Any| {
     public open fun toString(): R|kotlin/String|
 
+    private constructor()
+
 }
 
 public final annotation class UnsafeVariance : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt
index 4587e9006d1..54bbcbdb602 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedAnnotation.txt
@@ -1,2 +1,4 @@
 public final annotation class AnnotatedAnnotation : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt
index a8e15e2dd55..53a8d312b0c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotatedMethod.txt
@@ -1,4 +1,6 @@
 public open class AnnotatedMethod : R|kotlin/Any| {
     public open fun f(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
index 6bcdc72b854..b4065833579 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/AnnotationInAnnotationArguments.txt
@@ -1,14 +1,24 @@
 public final class AnnotationInAnnotationArguments : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
+    private constructor()
+
 }
 
 public final annotation class EnumOption : R|kotlin/Annotation| {
+    public constructor(option: R|test/E|)
+
 }
 
 public final annotation class OptionGroups : R|kotlin/Annotation| {
+    public constructor(o1: R|test/StringOptions|, o2: R|test/EnumOption|)
+
 }
 
 public final annotation class StringOptions : R|kotlin/Annotation| {
+    public constructor(vararg option: R|kotlin/Array<out kotlin/String>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
index 1036b64fa1d..19c836da851 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/ClassLiteralArguments.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(klass: R|kotlin/reflect/KClass<*>|, klasses: R|kotlin/Array<kotlin/reflect/KClass<*>>|, sarKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/String>>|, d2arKlass: R|kotlin/reflect/KClass<kotlin/Array<kotlin/DoubleArray>>|)
+
 }
 
 public final class Klass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
index 7976b47611a..7639fd525a1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/EnumArgumentWithCustomToString.txt
@@ -1,13 +1,21 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
+    private constructor()
+
 }
 
 public final annotation class EnumAnno : R|kotlin/Annotation| {
+    public constructor(value: R|test/E|)
+
 }
 
 public final class EnumArgumentWithCustomToString : R|kotlin/Any| {
     public final fun annotated(): R|kotlin/Unit|
 
+    public constructor()
+
 }
 
 public final annotation class EnumArrayAnno : R|kotlin/Annotation| {
+    public constructor(vararg value: R|kotlin/Array<out test/E>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
index f3a73c9ec96..b68e40cec95 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/MultiDimensionalArrayMethod.txt
@@ -1,4 +1,6 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(s: R|kotlin/String|)
+
 }
 
 public abstract interface T : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
index 1036b64fa1d..b5ce602b08d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/PrimitiveArrayArguments.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(bytes: R|kotlin/ByteArray|, shorts: R|kotlin/ShortArray|, ints: R|kotlin/IntArray|, longs: R|kotlin/LongArray|, chars: R|kotlin/CharArray|, floats: R|kotlin/FloatArray|, doubles: R|kotlin/DoubleArray|, booleans: R|kotlin/BooleanArray|)
+
 }
 
 public final class Klass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt
index 42fd5b38e80..692dcc595f3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/SimpleAnnotation.txt
@@ -1,2 +1,4 @@
 public final annotation class SimpleAnnotation : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
index 7a376966e71..87adcad4ce8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/TargetedAnnotation.txt
@@ -1,2 +1,4 @@
 public final annotation class TargetedAnnotation : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
index 91eb9de6402..d41c02a2200 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/ClassObjectPropertyField.txt
@@ -1,8 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
index 0d17136c0da..b18dece9b81 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Constructor.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/String|)
+
 }
 
 public final class Constructor : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
index f1297cfe23b..9a6841355a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/DelegatedProperty.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
index 22101b7daa9..a3a72552a90 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumArgument.txt
@@ -1,7 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(t: R|java/lang/annotation/ElementType|)
+
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
index cab9a6fce59..f8d33d1ed6a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/EnumEntry.txt
@@ -1,8 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/String|, x: R|kotlin/Int|)
+
 }
 
 public final annotation class Bnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final enum class Eee : R|kotlin/Enum<test/Eee>| {
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt
index 22101b7daa9..bd0f506760a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Function.txt
@@ -1,7 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
index f1297cfe23b..9a6841355a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Getter.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
index ca1fb4643db..580bd430c14 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/HiddenConstructorWithInlineClassParameters.txt
@@ -1,20 +1,34 @@
 public final annotation class Ann : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public sealed class Sealed : R|kotlin/Any| {
+    private constructor(z: R|test/Z|)
+
     public final class Derived : R|test/Sealed| {
+        public constructor(z: R|test/Z|)
+
     }
 
 }
 
 public final class Test : R|kotlin/Any| {
+    public constructor(z: R|test/Z|, a: R|kotlin/Int|)
+
+    private constructor(z: R|test/Z|, s: R|kotlin/String|)
+
+    public constructor(z: R|test/Z|)
+
 }
 
 public final inline class Z : R|kotlin/Any| {
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(x: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
index f1297cfe23b..9a6841355a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PropertyField.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
index 84768b937a3..36c71d1b071 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/PublishedApiAnnotationOnInlineClassCosntructor.txt
@@ -1,8 +1,10 @@
 public final inline class Z : R|kotlin/Any| {
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    internal constructor(value: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
index f1297cfe23b..9a6841355a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classMembers/Setter.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
index a70ade26a6d..d33a0c5cd16 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/AnnotationInClassObject.txt
@@ -1,10 +1,20 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
         public final annotation class Anno1 : R|kotlin/Annotation| {
+            public constructor()
+
         }
 
         public final class B : R|kotlin/Any| {
+            public constructor()
+
             public final annotation class Anno2 : R|kotlin/Annotation| {
+                public constructor()
+
             }
 
         }
@@ -14,4 +24,6 @@ public final class A : R|kotlin/Any| {
 }
 
 public final class C : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
index 617fecadd23..55f905fa328 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassInClassObject.txt
@@ -1,9 +1,17 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
         public final class Nested : R|kotlin/Any| {
+            public constructor()
+
         }
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
index 91eb9de6402..d41c02a2200 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObject.txt
@@ -1,8 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
index d558ab2fffa..d0f9745912e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/ClassObjectInStaticNestedClass.txt
@@ -1,6 +1,12 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final class B : R|kotlin/Any| {
+        public constructor()
+
         public final companion object Companion : R|kotlin/Any| {
+            private constructor()
+
         }
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
index 280c6e3dc15..751fb1b488d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DataClass.txt
@@ -3,10 +3,12 @@ public final data class My : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/Int|): R|test/My|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(x: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
index d147b5a0e6f..632cc66b653 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Deprecated.txt
@@ -1,11 +1,19 @@
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
     public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
index e3f636b7395..d19f1a8c361 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/DollarsInAnnotationName.txt
@@ -1,11 +1,19 @@
 public final annotation class $$$$$$ : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class A : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final annotation class Anno$tation : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Cla$s : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
index 1af5d5b6d4b..d48d5bf945c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/EnumArgument.txt
@@ -1,14 +1,24 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(t: R|java/lang/annotation/ElementType|)
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
     public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
index 700545fb667..c16e12956f8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/MultipleAnnotations.txt
@@ -1,11 +1,19 @@
 public final annotation class A1 : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class A2 : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class A3 : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
index c32724ef850..d9f758ab2db 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedAnnotation.txt
@@ -1,5 +1,9 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final annotation class Anno : R|kotlin/Annotation| {
+        public constructor()
+
     }
 
 }
@@ -7,4 +11,6 @@ public final class A : R|kotlin/Any| {
 public final class B : R|kotlin/Any| {
     public final fun f(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
index 1ef4ea60d8b..2a61e99c5bd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/NestedClass.txt
@@ -1,11 +1,19 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
index f5b9ac7ff59..659d26ac8ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Retention.txt
@@ -1,2 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
index 41e8612f5e1..84f04f5b1f9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/Simple.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class X : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
index 07b97455850..281963d7071 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithArgument.txt
@@ -1,26 +1,44 @@
 public final annotation class BooleanAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Boolean|)
+
 }
 
 public final annotation class ByteAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Byte|)
+
 }
 
 public final annotation class CharAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Char|)
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Double|)
+
 }
 
 public final annotation class FloatAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Float|)
+
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Int|)
+
 }
 
 public final annotation class LongAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Long|)
+
 }
 
 public final annotation class ShortAnno : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Short|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
index f1297cfe23b..ab93d9b6308 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/classes/WithMultipleArguments.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(int: R|kotlin/Int|, string: R|kotlin/String|, double: R|kotlin/Double|)
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt
index f5b9ac7ff59..659d26ac8ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/DelegatedProperty.txt
@@ -1,2 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
index 12063c53954..c62a92c619a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArgument.txt
@@ -1,4 +1,6 @@
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(t: R|java/lang/annotation/ElementType|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
index 45d00f5a1bc..2283a2a028e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/EnumArrayArgument.txt
@@ -3,4 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(vararg t: R|kotlin/Array<out java/lang/annotation/ElementType>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt
index 4b7c0ce0108..ba3d034fc3d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Function.txt
@@ -1,4 +1,6 @@
 public final fun function(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt
index f5b9ac7ff59..659d26ac8ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Getter.txt
@@ -1,2 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt
index f5b9ac7ff59..659d26ac8ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/PropertyField.txt
@@ -1,2 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt
index f5b9ac7ff59..659d26ac8ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/Setter.txt
@@ -1,2 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
index 45d00f5a1bc..6ffc4e1627e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/packageMembers/StringArrayArgument.txt
@@ -3,4 +3,6 @@ public final fun baz(): R|kotlin/Unit|
 public final fun foo(): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor(vararg t: R|kotlin/Array<out kotlin/String>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
index a9e426ab9e9..261668929e5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/Constructor.txt
@@ -1,8 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class B : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor(x: R|kotlin/Int|, y: R|kotlin/String|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
index ba3c27bc704..2dffe81cd5c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/EnumConstructor.txt
@@ -1,8 +1,14 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class B : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final enum class E : R|kotlin/Enum<test/E>| {
+    private constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt
index a6c8e98ab5f..af482dc2f7d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunction.txt
@@ -1,4 +1,6 @@
 public final fun R|kotlin/Int|.foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
index 081710160d7..bea0cbaff59 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionFunctionInClass.txt
@@ -1,7 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun R|kotlin/String|.foo(x: R|kotlin/Int|): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
index 910dd10c489..cb013f97a2b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ExtensionPropertySetter.txt
@@ -1,5 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt
index 9fd862ef8eb..26357e3acf9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInClass.txt
@@ -1,7 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/String|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt
index 3ea3de3831e..0838a074b32 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/FunctionInTrait.txt
@@ -1,4 +1,6 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public abstract interface Trait : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
index 85857b7c2de..c091126fda0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/InnerClassConstructor.txt
@@ -1,11 +1,19 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor(s: R|kotlin/String|)
+
 }
 
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public final inner class Inner : R|kotlin/Any| {
+        public constructor(y: R|kotlin/String|)
+
     }
 
     public final class Nested : R|kotlin/Any| {
+        public constructor(x: R|kotlin/String|)
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt
index 04250deefe6..bfe33d4064b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/ManyAnnotations.txt
@@ -3,13 +3,21 @@ public final fun bar(x: R|kotlin/Int|): R|kotlin/Unit|
 public final fun foo(x: R|kotlin/Int|, y: R|kotlin/Double|, z: R|kotlin/String|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class B : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class C : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class D : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
index 910dd10c489..cb013f97a2b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/PropertySetterInClass.txt
@@ -1,5 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt
index dc76615de79..8ed216488f9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelFunction.txt
@@ -1,4 +1,6 @@
 public final fun foo(x: R|kotlin/Int|): R|kotlin/Unit|
 
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
index b38b9c42a91..c6b1df0b2a3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/parameters/TopLevelPropertySetter.txt
@@ -1,5 +1,9 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class B : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
index f1297cfe23b..9a6841355a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Class.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
index 91eb9de6402..d41c02a2200 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ClassObject.txt
@@ -1,8 +1,14 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
index b1f25a3e337..24bdbc40288 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNameClass.txt
@@ -1,11 +1,19 @@
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
index 884aae46348..e39561666b1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/ExtensionsWithSameNamePackage.txt
@@ -1,8 +1,14 @@
 public final annotation class DoubleAnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class IntAnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final annotation class StringAnno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
index 011f89fa77f..848dcdfb9dc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/NestedTrait.txt
@@ -1,7 +1,11 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
     public abstract interface Trait : R|kotlin/Any| {
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
index f5b9ac7ff59..659d26ac8ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TopLevel.txt
@@ -1,2 +1,4 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
index 5a6793387dc..cfffb0e2a7f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/Trait.txt
@@ -1,4 +1,6 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public abstract interface Trait : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
index 0a3849887ce..ff510c08ac4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/propertiesWithoutBackingFields/TraitClassObject.txt
@@ -1,8 +1,12 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public abstract interface Trait : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
index 5e3e09d9bd7..53312d727e3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ClassLiteralArgument.txt
@@ -7,19 +7,31 @@ public final class A : R|kotlin/Any| {
 
     public final fun simple(s: R|kotlin/String|): R|kotlin/Unit|
 
+    public constructor()
+
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
+    public constructor(klass: R|kotlin/reflect/KClass<*>|)
+
 }
 
 <T> public final class Generic : R|kotlin/Any| {
+    public constructor()
+
 }
 
 <A, B> public final class InnerGeneric : R|kotlin/Any| {
+    public constructor()
+
     <C, D> public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
 
 public final class Simple : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt
index e3f23c20372..fa7ac70f435 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/ReceiverParameter.txt
@@ -1,4 +1,6 @@
 public final fun R|kotlin/String|.foo(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt
index 1419655bbfb..daef209c79a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SimpleTypeAnnotation.txt
@@ -1,7 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class SimpleTypeAnnotation : R|kotlin/Any| {
     public final fun foo(x: R|kotlin/ranges/IntRange|): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
index 23f29c22625..6883e1685fb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SourceRetention.txt
@@ -1,9 +1,13 @@
 public final fun typeAnnotation(): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class TypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
index 23925558ecb..5d24ccc5172 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/SupertypesAndBounds.txt
@@ -1,4 +1,6 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 <T> public abstract interface Foo : R|java/io/Serializable| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
index e1e9f8a26da..e169028ba46 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeAnnotationWithArguments.txt
@@ -1,7 +1,11 @@
 public final annotation class Ann : R|kotlin/Annotation| {
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|)
+
 }
 
 public final class TypeAnnotationWithArguments : R|kotlin/Any| {
     public final fun foo(param: R|kotlin/ranges/IntRange|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
index 14f257e2d2d..1da82d9bfae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeArgument.txt
@@ -1,4 +1,6 @@
 public final fun foo(bar: R|kotlin/collections/Map<kotlin/String, kotlin/collections/List<kotlin/Int>>|): R|kotlin/Unit|
 
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
index 0b3b9e69d3a..709bfd8645a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotation.txt
@@ -1,7 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
index 0b3b9e69d3a..82cea1ed0c4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/types/TypeParameterAnnotationWithArguments.txt
@@ -1,7 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Double|)
+
 }
 
 public final class SimpleTypeParameterAnnotation : R|kotlin/Any| {
     <T> public final fun foo(x: R|T|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
index ea4325a102e..5514dd84a6d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/DelegateTarget.txt
@@ -1,10 +1,16 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final class CustomDelegate : R|kotlin/Any| {
-    public final operator fun getValue(thisRef: R|kotlin/Any|, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
+    public final operator fun getValue(thisRef: R|kotlin/Any|?, prop: R|kotlin/reflect/KProperty<*>|): R|kotlin/String|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
index f1297cfe23b..9a6841355a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/FieldTarget.txt
@@ -1,5 +1,9 @@
 public final annotation class Anno : R|kotlin/Annotation| {
+    public constructor()
+
 }
 
 public final class Class : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
index 3a1c6d7e8c2..8c0d654d6b3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/PropertyAndAccessor.txt
@@ -1,7 +1,11 @@
 public final annotation class A : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/String|)
+
 }
 
 public final annotation class B : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/Array<kotlin/String>|)
+
 }
 
 public abstract interface I : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
index 6bc4776ad83..ec150faa7b3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/annotations/withUseSiteTarget/ReceiverTarget.txt
@@ -1,7 +1,11 @@
 public final class A : R|kotlin/Any| {
     public final fun R|kotlin/String|.myLength(q: R|kotlin/String|): R|kotlin/Int|
 
+    public constructor()
+
 }
 
 public final annotation class Ann : R|kotlin/Annotation| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt
index f40ebca0d30..9173e4e2705 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/Class.txt
@@ -1,2 +1,4 @@
 public final class Ramification : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
index e8f74955b97..32e52e434ff 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInParam.txt
@@ -1,2 +1,4 @@
 <T> public final class Wine : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt
index 6beeb404f02..31a0a7513aa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassInnerClass.txt
@@ -1,5 +1,9 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
index 699d3bf2300..62e7efe2a02 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassMemberConflict.txt
@@ -1,11 +1,19 @@
 <test> public final class ConstructorTypeParamClassObjectConflict : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 <test> public final class ConstructorTypeParamClassObjectTypeConflict : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
         public abstract interface test : R|kotlin/Any| {
         }
 
@@ -14,19 +22,31 @@
 }
 
 public final class TestClassObjectAndClassConflict : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class TestConstructorParamClassObjectConflict : R|kotlin/Any| {
+    public constructor(test: R|kotlin/String|)
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class TestConstructorValClassObjectConflict : R|kotlin/Any| {
+    public constructor(test: R|kotlin/String|)
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
index 2cda575a9b6..aa82ea29a5e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassOutParam.txt
@@ -1,2 +1,4 @@
 <T> public final class Juice : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
index f2b308fca84..bcba23bb850 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParam.txt
@@ -1,2 +1,4 @@
 <T> public final class Beer : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
index 73767ddfc45..b4e8c8ab04c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam.txt
@@ -1,2 +1,4 @@
 <A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
index 73767ddfc45..b4e8c8ab04c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesParam2.txt
@@ -1,2 +1,4 @@
 <A, B> public final class ClassParamReferencesParam : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
index f8a4f211e1e..0f238e0c0f2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamReferencesSelf.txt
@@ -1,4 +1,6 @@
 <A> public final class ClassParamReferencesSelf : R|kotlin/Any| {
+    public constructor()
+
 }
 
 <P> public abstract interface TraitWithP : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
index befe5dd232f..87f02bd7c71 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassBound.txt
@@ -1,2 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
index befe5dd232f..87f02bd7c71 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperClassInterfaceBound.txt
@@ -1,2 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
index befe5dd232f..87f02bd7c71 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassParamUpperInterfaceBound.txt
@@ -1,2 +1,4 @@
 <A> public final class Clock : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
index cb952db06f2..789aaef95d5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class ClassTwoParams : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
index cb952db06f2..789aaef95d5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/ClassTwoParams2.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class ClassTwoParams : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
index 3fb9b9ca1ba..a2c9b1859a5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithGenericConstructorParameter.txt
@@ -1,2 +1,4 @@
 public final enum class EnumWithGenericConstructorParameter : R|kotlin/Enum<test/EnumWithGenericConstructorParameter>| {
+    private constructor(list: R|kotlin/collections/List<kotlin/String>|?)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
index 5d960b560ee..212eb164d31 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/EnumWithPrimitiveConstructorParameter.txt
@@ -1,2 +1,4 @@
 public final enum class EnumWithPrimitiveConstructorParameter : R|kotlin/Enum<test/EnumWithPrimitiveConstructorParameter>| {
+    private constructor(b: R|kotlin/Boolean|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt
index 0a0d268991b..1110ad1298d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassSimple.txt
@@ -1,5 +1,9 @@
 public abstract class Aaa : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final class Bbb : R|test/Aaa| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
index ae1eac2ff27..399e61f2afa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritClassWithParam.txt
@@ -1,5 +1,9 @@
 <P> public abstract class Aaa : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
index 9e4802eb2d7..9dfaab925cc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritSubstitutedMethod.txt
@@ -8,4 +8,6 @@
 public final class B : R|test/A<kotlin/String>| {
     public open fun bar(): R|kotlin/String|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt
index e0b5b9a34cb..63f8f9dc2ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithFunctionParam.txt
@@ -1,4 +1,6 @@
 public open class Class : R|test/Trait| {
+    public constructor()
+
 }
 
 public abstract interface Trait : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
index 54672a858aa..cc7a7d91673 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InheritTraitWithParam.txt
@@ -2,4 +2,6 @@
 }
 
 public final class Bbb : R|test/Aaa<java/util/Random>| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
index 6971af52019..246de5c9986 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerClassExtendInnerClass.txt
@@ -1,8 +1,14 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public open inner class Inner1 : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final inner class Inner2 : R|test/Outer.Inner1| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
index ac0f7045dc3..2a51c8d856b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerGenericClass.txt
@@ -1,5 +1,9 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     <T> public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
index 67fd6207565..6c99a8e15c7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/InnerTypes.txt
@@ -1,15 +1,23 @@
 <E, F> public final class Outer : R|kotlin/Any| {
     public final fun bar(x: R|test/Outer.Inner2<kotlin/String, kotlin/Double>|, y: R|test/Outer.Inner2<E, F>|): R|kotlin/Unit|
 
+    public constructor()
+
     <G, H> public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
         <I> public final inner class Inner3 : R|kotlin/Any| {
             public final fun foo(x: R|test/Outer.Inner<G, kotlin/Int, kotlin/String, F>|, y: R|test/Outer.Inner<E, kotlin/Double, E, F>|, z: R|test/Outer.Inner.Inner3<kotlin/Double, G, kotlin/Int, kotlin/String, F>|, w: R|test/Outer.Inner.Inner3<*, G, H, E, F>|): R|kotlin/Unit|
 
+            public constructor()
+
         }
 
     }
 
     public final inner class Inner2 : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
index dcd0739a96a..2d79d4f5443 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObject.txt
@@ -1,4 +1,6 @@
 public final object Obj : R|kotlin/Any| {
     public final fun f(): R|kotlin/String|
 
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
index 9a56a032acc..be72a5e1331 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClass.txt
@@ -1,7 +1,11 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
index 2aee021c051..20fcab10c46 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInClassObject.txt
@@ -1,8 +1,14 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
         public final object Obj : R|kotlin/Any| {
             public final fun f(): R|kotlin/String|
 
+            private constructor()
+
         }
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
index 739af71f4b3..80c6f57e51b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectInNamedObject.txt
@@ -1,7 +1,11 @@
 public final object Outer : R|kotlin/Any| {
+    private constructor()
+
     public final object Obj : R|kotlin/Any| {
         public final fun f(): R|kotlin/String|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
index dcd0739a96a..2d79d4f5443 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NamedObjectWithAnotherTopLevelProperty.txt
@@ -1,4 +1,6 @@
 public final object Obj : R|kotlin/Any| {
     public final fun f(): R|kotlin/String|
 
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt
index 86f8ef85918..7994d2a97fb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClass.txt
@@ -1,5 +1,9 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public final class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
index 32834a3e7cc..dfbd355e003 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedClassExtendNestedClass.txt
@@ -1,8 +1,14 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public open class Nested1 : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final class Nested2 : R|test/Outer.Nested1| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
index 0abec85ea2a..28ed2422497 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/NestedGenericClass.txt
@@ -1,5 +1,9 @@
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     <T> public final class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
index 012f6e70864..7251a85dc6a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/DifferentGetterAndSetter.txt
@@ -1,6 +1,8 @@
 public open class DifferentGetterAndSetter : R|kotlin/Any| {
     public open fun getSomething(): R|kotlin/Int|
 
-    public open fun setSomething(p0: R|kotlin/String|): R|kotlin/Unit|
+    public open fun setSomething(p0: R|kotlin/String|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
index e570d3822fb..33d6a54c3ff 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVal.txt
@@ -1,4 +1,6 @@
 public open class JavaBeanVal : R|kotlin/Any| {
-    public open fun getColor(): R|kotlin/String|
+    public open fun getColor(): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
index 03e4b9a7337..01e1b3e92b5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVar.txt
@@ -1,6 +1,8 @@
 public open class JavaBeanVar : R|kotlin/Any| {
-    public open fun getColor(): R|kotlin/String|
+    public open fun getColor(): R|kotlin/String|?
 
-    public open fun setColor(p0: R|kotlin/String|): R|kotlin/Unit|
+    public open fun setColor(p0: R|kotlin/String|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
index c5f7143d85d..41be34a60ff 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/JavaBeanVarOfGenericType.txt
@@ -1,6 +1,8 @@
 <P> public open class JavaBeanVarOfGenericType : R|kotlin/Any| {
-    public open fun getCharacters(): R|java/util/ArrayList<P>|
+    public open fun getCharacters(): R|java/util/ArrayList<P>|?
 
-    public open fun setCharacters(p0: R|java/util/ArrayList<P>|): R|kotlin/Unit|
+    public open fun setCharacters(p0: R|java/util/ArrayList<P>|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
index fdb70e36b20..ea1d80b72fe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/class/javaBean/TwoSetters.txt
@@ -1,6 +1,8 @@
 public open class TwoSetters : R|kotlin/Any| {
     public open fun setSize(p0: R|kotlin/Int|): R|kotlin/Unit|
 
-    public open fun setSize(p0: R|kotlin/String|): R|kotlin/Unit|
+    public open fun setSize(p0: R|kotlin/String|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
index 1dd6d61e2c4..1bb43a3bf6c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassInParamUsedInFun.txt
@@ -1,4 +1,6 @@
 <T> public final class ClassParamUsedInFun : R|kotlin/Any| {
     public final fun f(t: R|T|): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
index 1dd6d61e2c4..1bb43a3bf6c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/ClassParamUsedInFun.txt
@@ -1,4 +1,6 @@
 <T> public final class ClassParamUsedInFun : R|kotlin/Any| {
     public final fun f(t: R|T|): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt
index f161f8696ba..a3ba6c4211f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunDelegationToTraitImpl.txt
@@ -4,4 +4,6 @@ public abstract interface A : R|kotlin/Any| {
 }
 
 public final class B : R|test/A| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
index 5ce5098ad4d..83526d60892 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classFun/FunInParamSuper.txt
@@ -1,7 +1,11 @@
 <T> public open class Base : R|kotlin/Any| {
     public final fun foo(): R|T|
 
+    public constructor()
+
 }
 
 public final class Inh : R|test/Base<kotlin/String>| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
index be4de6ad0a6..e049155754a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVal.txt
@@ -1,5 +1,9 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
index be4de6ad0a6..e049155754a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDeclaresVar.txt
@@ -1,5 +1,9 @@
 public final class ClassObjectDeclaresProperty : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
index ba5b495ec4f..60a4293f254 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectDefaultVisibility.txt
@@ -1,30 +1,52 @@
 public final class Int : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class Outer : R|kotlin/Any| {
+    public constructor()
+
     public final class Int : R|kotlin/Any| {
+        public constructor()
+
         public final companion object Companion : R|kotlin/Any| {
+            private constructor()
+
         }
 
     }
 
     private final class Pri : R|kotlin/Any| {
+        public constructor()
+
         public final companion object Companion : R|kotlin/Any| {
+            private constructor()
+
         }
 
     }
 
     protected final class Pro : R|kotlin/Any| {
+        public constructor()
+
         public final companion object Companion : R|kotlin/Any| {
+            private constructor()
+
         }
 
     }
 
     public final class Pub : R|kotlin/Any| {
+        public constructor()
+
         public final companion object Companion : R|kotlin/Any| {
+            private constructor()
+
         }
 
     }
@@ -32,13 +54,21 @@ public final class Outer : R|kotlin/Any| {
 }
 
 private final class Pri : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class Pub : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
index f537b2a75bf..a74bcdf9fa6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExplicitVisibility.txt
@@ -1,53 +1,89 @@
 internal final class IntInt : R|kotlin/Any| {
+    public constructor()
+
     internal final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 internal final class IntPri : R|kotlin/Any| {
+    public constructor()
+
     private final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 internal final class IntPub : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 private final class PriInt : R|kotlin/Any| {
+    public constructor()
+
     internal final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 private final class PriPri : R|kotlin/Any| {
+    public constructor()
+
     private final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 private final class PriPub : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class PubInt : R|kotlin/Any| {
+    public constructor()
+
     internal final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class PubPri : R|kotlin/Any| {
+    public constructor()
+
     private final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public final class PubPub : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
index f7b7dff8501..df03e68aef1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTrait.txt
@@ -2,7 +2,11 @@ public abstract interface Bbb : R|kotlin/Any| {
 }
 
 public final class ClassObjectextendsTrait : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|test/Bbb| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
index 0bebad7b594..4b424663c8f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectExtendsTraitWithTP.txt
@@ -2,7 +2,11 @@
 }
 
 public final class ClassObjectExtendsTraitWithTP : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|test/Bbb<kotlin/String>| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
index 59ff74817c8..811382acc54 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInClassStaticFields.txt
@@ -1,7 +1,11 @@
 public final class Test : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
index b752ebe372d..c509fa4ab89 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectInTraitStaticFields.txt
@@ -2,6 +2,8 @@ public abstract interface Test : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
         public final fun incProp4(): R|kotlin/Unit|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
index 399b39f2991..ac714fcce15 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/ClassObjectPropertyInClass.txt
@@ -1,5 +1,9 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt
index 7d7f0a2eb33..3079c5af02a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/Delegation.txt
@@ -1,9 +1,13 @@
 public final class A : R|test/T| {
     public open fun foo(): R|kotlin/Int|
 
+    public constructor()
+
     public final companion object Companion : R|test/T| {
         public open fun foo(): R|kotlin/Int|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
index c214d53a38e..88b6c06cad8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/InnerClassInClassObject.txt
@@ -1,15 +1,23 @@
 public final class TestFirst : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
         public final fun testing(a: R|test/TestFirst.InnerClass|): R|kotlin/Int|
 
         public final fun testing(a: R|test/TestFirst.NotInnerClass|): R|kotlin/Int|
 
+        private constructor()
+
     }
 
     public final inner class InnerClass : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final inner class NotInnerClass : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
index 1be1d776dae..526313bc1c0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/NamedClassObject.txt
@@ -1,7 +1,11 @@
 public final class NamedClassObject : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Named : R|kotlin/Any| {
         public final fun f(): R|kotlin/Int|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
index 3f2e3acf6da..b72a2388db2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/classObject/SimpleClassObject.txt
@@ -1,5 +1,9 @@
 public final class SimpleClassObject : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt
index a8fbaf1c2e5..d41a0d83ffa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor0.txt
@@ -1,2 +1,4 @@
 public final class ClassWithConstructor0 : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt
index 602f1342468..c39e25c0f3b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1.txt
@@ -1,2 +1,4 @@
 public final class ClassWithConstructor1 : R|kotlin/Any| {
+    public constructor(p: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt
index f8c52840bbb..06a05101718 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor1WithParamDefaultValue.txt
@@ -1,2 +1,4 @@
 public final class ClassWithConstructorWithValueParamWithDefaultValue : R|kotlin/Any| {
+    public constructor(p: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
index 5c468b626ec..07143c32fb5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/Constructor2WithOneParamDefaultValue.txt
@@ -1,2 +1,4 @@
 public final class TestConstructor : R|kotlin/Any| {
+    public constructor(p: R|kotlin/Int|, s: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
index d6249e263f7..47ba231beb4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorCollectionParameter.txt
@@ -1,2 +1,4 @@
 public final class TestingKotlinCollections : R|kotlin/Any| {
+    public constructor(arguments: R|kotlin/collections/Collection<kotlin/String>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
index b4d7f3b45bb..4ee36bc9daa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericDeep.txt
@@ -1,2 +1,4 @@
 public open class ConstructorGenericDeep : R|kotlin/Any| {
+    public constructor(p0: R|java/lang/Class<kotlin/Any>|?)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
index b7acf6d10fb..701641c7b85 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericSimple.txt
@@ -1,2 +1,4 @@
 public open class ConstructorGenericSimple : R|kotlin/Any| {
+    public constructor(p0: R|kotlin/Any|?)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
index f68ea70bb0e..88704e09b08 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorGenericUpperBound.txt
@@ -1,2 +1,4 @@
 public open class ConstructorGenericUpperBound : R|kotlin/Any| {
+    public constructor(p0: R|java/util/RandomAccess|?)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt
index 5c468b626ec..f219fc3a799 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoDefArgs.txt
@@ -1,2 +1,4 @@
 public final class TestConstructor : R|kotlin/Any| {
+    public constructor(p: R|kotlin/Int|, d: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
index 8c638e00272..23012c1c331 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParameters.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
index 8c638e00272..fc2ca45e8cd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOneIntValueParameter.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+    public constructor(q: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
index 8c638e00272..5b62e492e30 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTwoTypeParametersAndOnePValueParameter.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+    public constructor(q: R|Q|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
index 388b6b3a04a..ace51302eae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParameter.txt
@@ -1,2 +1,4 @@
 <P> public final class ClassWithConstructorAndTypeParameter : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
index 14be6ebfa3d..abe20bf0b30 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/ConstructorWithTypeParametersEAndOnePValueParameter.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class OneTypeParameterErased : R|kotlin/Any| {
+    public constructor(q: R|Q|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
index 7fb83820b48..087d2d01d60 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/InnerClassConstructorWithDefArgs.txt
@@ -1,5 +1,9 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final class TestConstructor : R|kotlin/Any| {
+        public constructor(p: R|kotlin/Int|)
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
index 5c468b626ec..791b1a8470d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/PrivateConstructor1WithParamDefaultValue.txt
@@ -1,2 +1,4 @@
 public final class TestConstructor : R|kotlin/Any| {
+    private constructor(p: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt
index 8ac7e84e909..2ab56da6994 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorNonLastVararg.txt
@@ -1,2 +1,4 @@
 public final class A : R|kotlin/Any| {
+    public constructor(vararg a: R|kotlin/IntArray|, f: R|kotlin/Function0<kotlin/Unit>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt
index 8ac7e84e909..b9b6e935ed7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/constructor/vararg/ConstructorVararg.txt
@@ -1,2 +1,4 @@
 public final class A : R|kotlin/Any| {
+    public constructor(vararg a: R|kotlin/IntArray|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt
index 34426bb3a62..794a0581b5e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/coroutines/Basic.txt
@@ -3,4 +3,6 @@ public final fun builder(c: R|error: createSuspendFunctionType not supported|):
 public final class Controller : R|kotlin/Any| {
     public final suspend fun suspendFun(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
index 3981a5a6aa6..3723fb04fb5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/MixedComponents.txt
@@ -5,10 +5,12 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String|, z: R|kotlin/Double|): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(x: R|kotlin/String|, z: R|kotlin/Double|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
index 608967128b8..e99fc9084ce 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/OneVal.txt
@@ -3,10 +3,12 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String|): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(x: R|kotlin/String|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
index 84d84c6d312..70f643e5dda 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVals.txt
@@ -5,10 +5,12 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
index 84d84c6d312..70f643e5dda 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/dataClass/TwoVars.txt
@@ -5,10 +5,12 @@ public final data class DataClass : R|kotlin/Any| {
 
     public final fun copy(x: R|kotlin/String|, y: R|kotlin/Int|): R|test/DataClass|
 
-    public open operator fun equals(other: R|kotlin/Any|): R|kotlin/Boolean|
+    public open operator fun equals(other: R|kotlin/Any|?): R|kotlin/Boolean|
 
     public open fun hashCode(): R|kotlin/Int|
 
     public open fun toString(): R|kotlin/String|
 
+    public constructor(x: R|kotlin/String|, y: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
index 8674f993aa2..a1479cce83b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumVisibility.txt
@@ -1,8 +1,14 @@
 internal final enum class In : R|kotlin/Enum<test/In>| {
+    private constructor()
+
 }
 
 private final enum class Pr : R|kotlin/Enum<test/Pr>| {
+    private constructor()
+
 }
 
 public final enum class Pu : R|kotlin/Enum<test/Pu>| {
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
index 2189a3c7485..466a4f919ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithConstuctor.txt
@@ -1,2 +1,4 @@
 public final enum class En : R|kotlin/Enum<test/En>| {
+    private constructor(b: R|kotlin/Boolean|, i: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
index de61e793ffa..f9038cb157c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/EnumWithInnerClasses.txt
@@ -1,10 +1,16 @@
 public final enum class Enum : R|kotlin/Enum<test/Enum>| {
     public final fun f(): R|kotlin/Int|
 
+    private constructor()
+
     public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public abstract interface Trait : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
index c377d43bb9b..4e5c44c30b2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnum.txt
@@ -1,5 +1,9 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final enum class E : R|kotlin/Enum<test/A.E>| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
index 0c93e519247..fd881a25eee 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/InnerEnumExistingClassObject.txt
@@ -1,8 +1,14 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
     public final enum class E : R|kotlin/Enum<test/A.E>| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
index 2187c204663..f43e3309949 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/enum/SimpleEnum.txt
@@ -1,2 +1,4 @@
 public final enum class MyEnum : R|kotlin/Enum<test/MyEnum>| {
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
index 97a2eeac000..8db182338d3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ArrayTypeVariance.txt
@@ -1,4 +1,6 @@
 public final class ArrayTypeVariance : R|kotlin/Any| {
-    public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>|): R|kotlin/Array<kotlin/Any>|
+    public final fun toArray(p0: R|kotlin/Array<out kotlin/Any>|?): R|kotlin/Array<kotlin/Any>|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
index 1c7b9159206..e05788adf23 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassDoesNotOverrideMethod.txt
@@ -1,2 +1,4 @@
 public abstract class ClassDoesNotOverrideMethod : R|java/util/Date| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt
index d71c1859cbf..5d210823a71 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObject.txt
@@ -1,5 +1,7 @@
 public abstract interface TheTrait : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
index e2cc09f1190..1f9a14a02e8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassObjectAnnotation.txt
@@ -1,6 +1,12 @@
 public final class Some : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
         public final annotation class TestAnnotation : R|kotlin/Annotation| {
+            public constructor()
+
         }
 
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
index 8865bbd9f2d..1092e7e0286 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithConstVal.txt
@@ -1,2 +1,4 @@
 public final class ClassWithConstVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
index 82814bfdcd0..5aa19c6c087 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypeP.txt
@@ -1,2 +1,4 @@
 <P> public final class ClassWithTypeP : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
index 483c49253f7..4cb18a0b66d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePExtendsIterableP.txt
@@ -1,2 +1,4 @@
 <P> public abstract class ClassWithTypePExtendsIterableP : R|kotlin/collections/MutableIterable<P>| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
index e29b4359870..e9b96b005b8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePP.txt
@@ -1,2 +1,4 @@
 <P, Q> public final class ClassWithTypePP : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
index 5d3850073b8..66f7a2721ff 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefNext.txt
@@ -1,2 +1,4 @@
 <R, P> public open class ClassWithTypePRefNext : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
index 8488c38b29f..94d91f2279a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelf.txt
@@ -1,2 +1,4 @@
 <P> public final class ClassWithTypePRefSelf : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
index 149630c53b0..05e709a2d88 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ClassWithTypePRefSelfAndClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ClassWithTypePRefSelfAndClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
index 4d8e55f9112..3c1b4b50751 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Enum.txt
@@ -1,2 +1,4 @@
 public final enum class Test : R|kotlin/Enum<test/Test>| {
+    private constructor(a: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
index 711c6b11592..f2b7a4cf522 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldAsVar.txt
@@ -1,2 +1,4 @@
 public final class FieldAsVar : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
index f16fc3da191..e56c8ab810a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FieldOfArrayType.txt
@@ -1,2 +1,4 @@
 public open class FieldOfArrayType : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
index 41a9e6325b5..7a14a233869 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/FinalFieldAsVal.txt
@@ -1,2 +1,4 @@
 public final class FinalFieldAsVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
index 2a9a29607f8..f2be61da8c8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypes.txt
@@ -1,18 +1,20 @@
 public final class InheritMethodsDifferentReturnTypes : R|kotlin/Any| {
+    public constructor()
+
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypes.Super1|, R|test/InheritMethodsDifferentReturnTypes.Super2| {
     }
 
     public abstract interface Super1 : R|kotlin/Any| {
-        public abstract fun bar(): R|kotlin/String|
+        public abstract fun bar(): R|kotlin/String|?
 
-        public abstract fun foo(): R|kotlin/CharSequence|
+        public abstract fun foo(): R|kotlin/CharSequence|?
 
     }
 
     public abstract interface Super2 : R|kotlin/Any| {
-        public abstract fun bar(): R|kotlin/CharSequence|
+        public abstract fun bar(): R|kotlin/CharSequence|?
 
-        public abstract fun foo(): R|kotlin/String|
+        public abstract fun foo(): R|kotlin/String|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
index 195cd99d879..64f7a9cece2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InheritMethodsDifferentReturnTypesGeneric.txt
@@ -1,4 +1,6 @@
 public final class InheritMethodsDifferentReturnTypesGeneric : R|kotlin/Any| {
+    public constructor()
+
     public abstract interface Sub : R|test/InheritMethodsDifferentReturnTypesGeneric.Super1<kotlin/String, kotlin/CharSequence>|, R|test/InheritMethodsDifferentReturnTypesGeneric.Super2<kotlin/CharSequence, kotlin/String>| {
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
index 4b126d16b18..2ec9eb96a15 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/InnerClass.txt
@@ -1,5 +1,9 @@
 public open class InnerClass : R|kotlin/Any| {
+    public constructor()
+
     public open inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
index 9ac8ce219b2..537ff0e4461 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePOneUpperBound.txt
@@ -1,4 +1,6 @@
 public open class MethodTypePOneUpperBound : R|kotlin/Any| {
     <T> public open fun bar(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
index e5e04f556ce..1442b6fb6df 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodTypePTwoUpperBounds.txt
@@ -1,4 +1,6 @@
 public open class MethodTypePTwoUpperBounds : R|kotlin/Any| {
     <T> public open fun foo(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
index 71061a3ace2..05150fda5ef 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypeP.txt
@@ -1,4 +1,6 @@
 public final class MethodWithTypeP : R|kotlin/Any| {
     <P> public final fun f(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
index f0c963ce0d5..2d9bfcb639a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePP.txt
@@ -1,4 +1,6 @@
 public final class MethodWithTypePP : R|kotlin/Any| {
     <P, Q> public final fun f(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
index da8654be7cf..d10ff4305b8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethodWithTypePRefClassP.txt
@@ -1,4 +1,6 @@
 <P> public open class MethodWithTypePRefClassP : R|kotlin/Any| {
     <Q> public final fun f(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
index c70125c7783..e5925f7cbd1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MethosWithPRefTP.txt
@@ -1,4 +1,6 @@
 public final class MethosWithPRefTP : R|kotlin/Any| {
     <P> public final fun f(p0: R|P|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
index ff45ae5bc4a..d19b0617ec3 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/MyException.txt
@@ -1,2 +1,4 @@
 public open class MyException : R|kotlin/Any| {
+    public constructor(p0: R|kotlin/String|?, p1: R|kotlin/Throwable|?)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
index d5118ed1a04..207bc013b19 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/NestedClass.txt
@@ -1,5 +1,9 @@
 public open class NestedClass : R|kotlin/Any| {
+    public constructor()
+
     public open class Nested : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
index d707a91c08c..c9b6c5217c9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectInClass.txt
@@ -1,7 +1,11 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
     public final object B : R|kotlin/Any| {
         public final fun foo(a: R|kotlin/Int|): R|kotlin/String|
 
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt
index d73ac66fc71..ec9cc0bab0a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/ObjectMembers.txt
@@ -1,4 +1,6 @@
 public final object SomeObject : R|kotlin/Any| {
     public final fun test(a: R|kotlin/Int|): R|kotlin/Int|
 
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt
index 155d9a62118..ce9b31fb6ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/PackageLevelObject.txt
@@ -1,2 +1,4 @@
 public final object Bar : R|kotlin/Any| {
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
index 893fde71fa4..69e64df39ff 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/RemoveRedundantProjectionKind.txt
@@ -1,6 +1,6 @@
 public abstract interface RemoveRedundantProjectionKind : R|kotlin/Any| {
-    public abstract fun f(p0: R|kotlin/Comparable<kotlin/CharSequence>|): R|kotlin/Unit|
+    public abstract fun f(p0: R|kotlin/Comparable<kotlin/CharSequence>|?): R|kotlin/Unit|
 
-    public abstract fun f(p0: R|kotlin/collections/Collection<kotlin/CharSequence>|): R|kotlin/Unit|
+    public abstract fun f(p0: R|kotlin/collections/Collection<kotlin/CharSequence>|?): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt
index c7bb2afab22..bfe63f8eaf4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/Simple.txt
@@ -1,2 +1,4 @@
 public final class Simple : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
index fa8ff3d4685..3728e9509ea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/TwoFields.txt
@@ -1,2 +1,4 @@
 public final class TwoFields : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
index 4a9ee481551..d056be17562 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/UnboundWildcard.txt
@@ -1,5 +1,7 @@
 public final class UnboundWildcard : R|kotlin/Any| {
-    public final fun foo(): R|test/UnboundWildcard.MyClass<*>|
+    public final fun foo(): R|test/UnboundWildcard.MyClass<*>|?
+
+    public constructor()
 
     <T> public abstract interface MyClass : R|kotlin/Any| {
     }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
index 8624cbe0557..9597588ea67 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/AllBoundsInWhen.txt
@@ -1,4 +1,6 @@
 public open class AllBoundsInWhen : R|kotlin/Any| {
     <T> public open fun foo(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt
index de9d16f743b..91030f9aa8e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ArrayType.txt
@@ -1,4 +1,6 @@
 public open class ArrayType : R|kotlin/Any| {
     public open fun foo(): R|kotlin/Array<kotlin/String>|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
index 72e70bb8219..e0e93b4f203 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithNewTypeParams.txt
@@ -1,2 +1,4 @@
 <T> public open class ConstructorWithNewTypeParams : R|kotlin/Any| {
+    public constructor(first: R|kotlin/Any|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
index d4a65f7479c..54c31e81d82 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithParentTypeParams.txt
@@ -1,2 +1,4 @@
 <T> public open class ConstructorWithParentTypeParams : R|kotlin/Any| {
+    public constructor(first: R|T|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt
index e5caf582b0c..b294c63c8e1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithSeveralParams.txt
@@ -1,2 +1,4 @@
 public open class ConstructorWithSeveralParams : R|kotlin/Any| {
+    public constructor(integer: R|kotlin/Int|, intField: R|kotlin/Int|, collection: R|java/util/ArrayList<kotlin/String>|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt
index f8a514f75f8..b6d77d015be 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/ConstructorWithoutParams.txt
@@ -1,2 +1,4 @@
 public open class ConstructorWithoutParams : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
index bb37669e5ee..2e95e0e946d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/CustomProjectionKind.txt
@@ -1,4 +1,6 @@
 public open class CustomProjectionKind : R|kotlin/Any| {
     public open fun foo(): R|kotlin/collections/MutableList<out kotlin/Number>|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
index 0b9ccb87130..4bd88aa9c8e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithFunctionTypes.txt
@@ -1,4 +1,6 @@
 public open class MethodWithFunctionTypes : R|kotlin/Any| {
-    public open fun foo(f: R|kotlin/Function1<kotlin/String, kotlin/String>|): R|kotlin/Function1<kotlin/String, kotlin/String>|
+    public open fun foo(f: R|kotlin/Function1<kotlin/String, kotlin/String>|): R|kotlin/Function1<kotlin/String, kotlin/String>|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
index 1473845f174..b71f77aadc6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithGenerics.txt
@@ -1,4 +1,6 @@
 public open class MethodWithGenerics : R|kotlin/Any| {
     public open fun foo(a: R|kotlin/String|, b: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
index 6af84a80bdd..2ac4320c42d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithMappedClasses.txt
@@ -1,4 +1,6 @@
 public open class MethodWithMappedClasses : R|kotlin/Any| {
     <T> public open fun copy(dest: R|kotlin/collections/MutableList<in T>|, src: R|kotlin/collections/List<T>|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
index 609091bb52f..d8cd29b7348 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithTypeParameters.txt
@@ -1,4 +1,6 @@
 public open class MethodWithTypeParameters : R|kotlin/Any| {
     <A, B> public open fun foo(a: R|A|, b: R|kotlin/collections/List<B>|, c: R|kotlin/collections/MutableList<in kotlin/String>|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt
index d5399e25c06..4e6f6a594e8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/MethodWithVararg.txt
@@ -1,4 +1,6 @@
 public open class MethodWithVararg : R|kotlin/Any| {
     public open fun foo(vararg s: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
index 97c573ccce3..8f199d129e5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyArrayTypes.txt
@@ -1,2 +1,4 @@
 <T> public open class PropertyArrayTypes : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
index 6b8eaec76dc..aa432e7b832 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertyComplexTypes.txt
@@ -1,2 +1,4 @@
 <T> public open class PropertyComplexTypes : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
index fb25183378e..e1e08377731 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/PropertySimpleType.txt
@@ -1,2 +1,4 @@
 public open class PropertySimpleType : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
index 9f8ed1107e0..c48f320be71 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/StarProjection.txt
@@ -1,6 +1,8 @@
 public final class StarProjection : R|kotlin/Any| {
     public final fun foo(): R|test/StarProjection.MyClass<*>|
 
+    public constructor()
+
     <T> public abstract interface MyClass : R|kotlin/Any| {
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt
index 98100b11ebe..daabb9a9fa9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/AddingNullability.txt
@@ -1,4 +1,6 @@
 public open class AddingNullability : R|kotlin/Any| {
     public open fun foo(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
index f35c1d13ae2..ea3bb610988 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ConflictingProjectionKind.txt
@@ -1,4 +1,6 @@
 public open class ConflictingProjectionKind : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>|): R|kotlin/Unit|
+    public open fun foo(p0: R|kotlin/collections/List<kotlin/Number>|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
index 392d9cee39c..6b98330f7c0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExplicitFieldGettersAndSetters.txt
@@ -1,2 +1,4 @@
 public open class ExplicitFieldGettersAndSetters : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
index 4f3d2c676e5..41127f0a566 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ExtraUpperBound.txt
@@ -1,4 +1,6 @@
 public open class ExtraUpperBound : R|kotlin/Any| {
-    <A> public open fun foo(): R|kotlin/String|
+    <A> public open fun foo(): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
index c748135c126..8e10c2a3b98 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/MissingUpperBound.txt
@@ -1,4 +1,6 @@
 public open class MissingUpperBound : R|kotlin/Any| {
-    <A> public open fun foo(): R|kotlin/String|
+    <A> public open fun foo(): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
index a45a990fb5c..e6c9d92fd5f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NoFieldTypeRef.txt
@@ -1,2 +1,4 @@
 public open class NoFieldTypeRef : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
index b3b98f5ea11..27a6ee4722d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/NotVarargReplacedWithVararg.txt
@@ -1,4 +1,6 @@
 public open class NotVarargReplacedWithVararg : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|): R|kotlin/Unit|
+    public open fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
index 740eeca7f59..b63e14a8541 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/RedundantProjectionKind.txt
@@ -1,4 +1,6 @@
 public open class RedundantProjectionKind : R|kotlin/Any| {
     public open fun foo(list: R|kotlin/collections/List<kotlin/Number>|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
index 95c3f99c0b3..ea936a0c21e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/ReturnTypeMissing.txt
@@ -1,4 +1,6 @@
 public open class ReturnTypeMissing : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|): R|kotlin/Int|
+    public open fun foo(p0: R|kotlin/String|?): R|kotlin/Int|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
index 1ab63412963..3d59523fe44 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxError.txt
@@ -1,4 +1,6 @@
 public open class SyntaxError : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/Int|
+    public open fun foo(): R|kotlin/Int|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
index 381a7fccae0..fb62deb316c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/SyntaxErrorInFieldAnnotation.txt
@@ -1,2 +1,4 @@
 public open class SyntaxErrorInFieldAnnotation : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
index e38cf5c76a9..21039e2d32e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/VarargReplacedWithNotVararg.txt
@@ -1,4 +1,6 @@
 public open class VarargReplacedWithNotVararg : R|kotlin/Any| {
     public open fun foo(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
index e82f31a9dd7..c6f79bc171f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldInitializer.txt
@@ -1,2 +1,4 @@
 public open class WrongFieldInitializer : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
index 874b8396b19..dbc2ab019e2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldMutability.txt
@@ -1,2 +1,4 @@
 public open class WrongFieldMutability : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
index 44bd9b06dfc..c572939ba6b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongFieldName.txt
@@ -1,2 +1,4 @@
 public open class WrongFieldName : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
index 8df8740727c..9241b5c1db1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongMethodName.txt
@@ -1,4 +1,6 @@
 public open class WrongMethodName : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/String|
+    public open fun foo(): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
index 3b8b596efd2..b26d61e737a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongProjectionKind.txt
@@ -1,4 +1,6 @@
 public open class WrongProjectionKind : R|kotlin/Any| {
-    public open fun copy(p0: R|kotlin/Array<out kotlin/Number>|, p1: R|kotlin/Array<out kotlin/Number>|): R|kotlin/collections/MutableList<kotlin/Number>|
+    public open fun copy(p0: R|kotlin/Array<out kotlin/Number>|?, p1: R|kotlin/Array<out kotlin/Number>|?): R|kotlin/collections/MutableList<kotlin/Number>|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
index c7cf5d109c8..7cd4d89abe8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongReturnTypeStructure.txt
@@ -1,4 +1,6 @@
 public open class WrongReturnTypeStructure : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
+    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
index 769aca3e5ef..5bf2f54b319 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName1.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeName1 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|): R|kotlin/String|
+    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
index ddd8b0bfbe2..dfad20e2928 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName2.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeName2 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|): R|kotlin/String|
+    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
index d7fcc69765f..532fc83430c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeName3.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeName3 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|): R|kotlin/String|
+    public open fun foo(p0: R|kotlin/String|?): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
index 8215835a24c..7c93e79b532 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure1.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeParameterBoundStructure1 : R|kotlin/Any| {
-    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|): R|kotlin/Unit|
+    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
index 60c5cb32a70..b196f349c41 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParameterBoundStructure2.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeParameterBoundStructure2 : R|kotlin/Any| {
-    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|): R|kotlin/Unit|
+    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
index a7c454f9a10..bbbadc567c5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongTypeParametersCount.txt
@@ -1,4 +1,6 @@
 public open class WrongTypeParametersCount : R|kotlin/Any| {
-    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|): R|kotlin/Unit|
+    <A, B> public open fun foo(p0: R|A|, p1: R|kotlin/collections/List<B>|?): R|kotlin/Unit|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
index 117e0263b98..0f639cd3fc4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure1.txt
@@ -1,4 +1,6 @@
 public open class WrongValueParameterStructure1 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
+    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
index 7ad3bea45d6..8b275c4a2d6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParameterStructure2.txt
@@ -1,4 +1,6 @@
 public open class WrongValueParameterStructure2 : R|kotlin/Any| {
-    public open fun foo(p0: R|kotlin/String|, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|): R|kotlin/String|
+    public open fun foo(p0: R|kotlin/String|?, p1: R|kotlin/collections/List<kotlin/collections/Map.Entry<kotlin/String, kotlin/String>>|?): R|kotlin/String|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
index 189790cda3d..6ef33ceba77 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/error/WrongValueParametersCount.txt
@@ -1,4 +1,6 @@
 public open class WrongValueParametersCount : R|kotlin/Any| {
-    public open fun foo(): R|kotlin/Int|
+    public open fun foo(): R|kotlin/Int|?
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
index 5ff573bb1b0..970d5dc04d2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVararg.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritNotVararg : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVararg.Super| {
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|?): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/String>|?): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
index 5e7f004d7e3..20d3aeb0203 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargInteger.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritNotVarargInteger : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargInteger.Super| {
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|?): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/Array<out kotlin/Int>|?): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
index 1fa50c1ddbc..4186233afd1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/InheritNotVarargPrimitive.txt
@@ -1,13 +1,13 @@
 public abstract interface InheritNotVarargPrimitive : R|kotlin/Any| {
     public abstract interface Sub : R|test/InheritNotVarargPrimitive.Super| {
-        public abstract fun foo(p0: R|kotlin/IntArray|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/IntArray|?): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/IntArray|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/IntArray|?): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
index c4214f21491..b99f4d9c104 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/Kt3302.txt
@@ -2,12 +2,12 @@ public abstract interface Kt3302 : R|kotlin/Any| {
     public abstract interface BSONObject : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun put(p0: R|kotlin/String|, p1: R|kotlin/Any|): R|kotlin/Any|
+        public abstract fun put(p0: R|kotlin/String|, p1: R|kotlin/Any|): R|kotlin/Any|?
 
     }
 
     public abstract interface BasicBSONObject : R|test/Kt3302.LinkedHashMap<kotlin/String, kotlin/Any>|, R|test/Kt3302.BSONObject| {
-        public abstract fun put(key: R|kotlin/String|, value: R|kotlin/Any|): R|kotlin/Any|
+        public abstract fun put(key: R|kotlin/String|, value: R|kotlin/Any|): R|kotlin/Any|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
index f1c7ea509b1..b5ae929498b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNull.txt
@@ -1,13 +1,13 @@
 public abstract interface NullableToNotNull : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNull.Super| {
-        public abstract fun foo(p0: R|kotlin/String|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p0: R|kotlin/String|): R|kotlin/Unit|
+        public abstract fun foo(p0: R|kotlin/String|?): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
index e717b6c5f28..39e72e2f40e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/parameter/NullableToNotNullKotlinSignature.txt
@@ -1,13 +1,13 @@
 public abstract interface NullableToNotNullKotlinSignature : R|kotlin/Any| {
     public abstract interface Sub : R|test/NullableToNotNullKotlinSignature.Super| {
-        public abstract fun foo(p: R|kotlin/String|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String|?): R|kotlin/Unit|
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(p: R|kotlin/String|): R|kotlin/Unit|
+        public abstract fun foo(p: R|kotlin/String|?): R|kotlin/Unit|
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
index 0d5ab9c8cf8..504da5b82c5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullJavaSubtype.txt
@@ -7,7 +7,7 @@ public abstract interface AddNotNullJavaSubtype : R|kotlin/Any| {
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|
+        public abstract fun foo(): R|kotlin/CharSequence|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
index 700d0d80ecc..7de6a021b83 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/AddNotNullSameJavaType.txt
@@ -7,7 +7,7 @@ public abstract interface AddNotNullSameJavaType : R|kotlin/Any| {
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|
+        public abstract fun foo(): R|kotlin/CharSequence|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
index 2387266ce8e..8f7bd0d10ad 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SameProjectionKind.txt
@@ -1,13 +1,13 @@
 public abstract interface SameProjectionKind : R|kotlin/Any| {
     public abstract interface Sub : R|test/SameProjectionKind.Super| {
-        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|
+        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|?
 
     }
 
     public abstract interface Super : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|
+        public abstract fun foo(): R|kotlin/collections/MutableCollection<out kotlin/Number>|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
index 0473ab14302..0e760e13ee2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/SubclassFromGenericAndNot.txt
@@ -9,7 +9,7 @@ public abstract interface SubclassFromGenericAndNot : R|kotlin/Any| {
     public abstract interface NonGeneric : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/String|
+        public abstract fun foo(): R|kotlin/String|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
index 98ec22c0232..d1453da60a8 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnJavaSubtype.txt
@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesReturnJavaSubtype : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|
+        public abstract fun foo(): R|kotlin/CharSequence|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
index 7d7f701f8b7..6efe800a818 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesReturnSameJavaType.txt
@@ -7,7 +7,7 @@ public abstract interface TwoSuperclassesReturnSameJavaType : R|kotlin/Any| {
     public abstract interface Super1 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/CharSequence|
+        public abstract fun foo(): R|kotlin/CharSequence|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
index 43fa9aae1cb..fce9491e0e7 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/kotlinSignature/propagation/return/TwoSuperclassesSupplementNotNull.txt
@@ -14,7 +14,7 @@ public abstract interface TwoSuperclassesSupplementNotNull : R|kotlin/Any| {
     public abstract interface Super2 : R|kotlin/Any| {
         public abstract fun dummy(): R|kotlin/Unit|
 
-        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|
+        public abstract fun foo(): R|kotlin/collections/List<kotlin/String>|?
 
     }
 
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
index b3e9ddd1dfe..68ebe69b017 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterable.txt
@@ -1,6 +1,6 @@
 <T> public abstract interface LoadIterable : R|kotlin/Any| {
-    public abstract fun getIterable(): R|kotlin/collections/MutableIterable<T>|
+    public abstract fun getIterable(): R|kotlin/collections/MutableIterable<T>|?
 
-    public abstract fun setIterable(p0: R|kotlin/collections/Iterable<T>|): R|kotlin/Unit|
+    public abstract fun setIterable(p0: R|kotlin/collections/Iterable<T>|?): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
index de02004c5ba..51b72ecbb13 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/LoadIterator.txt
@@ -1,6 +1,6 @@
 <T> public abstract interface LoadIterator : R|kotlin/Any| {
-    public abstract fun getIterator(): R|kotlin/collections/MutableIterator<T>|
+    public abstract fun getIterator(): R|kotlin/collections/MutableIterator<T>|?
 
-    public abstract fun setIterator(p0: R|kotlin/collections/Iterator<T>|): R|kotlin/Unit|
+    public abstract fun setIterator(p0: R|kotlin/collections/Iterator<T>|?): R|kotlin/Unit|
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
index 67795e5ca63..3e907b70b34 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/library/Max.txt
@@ -1,4 +1,6 @@
 public open class Max : R|kotlin/Any| {
-    <T> public open fun max(p0: R|kotlin/collections/Collection<T>|): R|T|
+    <T> public open fun max(p0: R|kotlin/collections/Collection<T>|?): R|T|
+
+    public constructor()
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
index e5ba65a1dd9..c663575801c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/modality/ModalityOfFakeOverrides.txt
@@ -1,4 +1,6 @@
 public open class ModalityOfFakeOverrides : R|java/util/AbstractList<kotlin/String>| {
     public open operator fun get(index: R|kotlin/Int|): R|kotlin/String|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
index 1bfbe042ec7..0fb2c04b74e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullField.txt
@@ -1,2 +1,4 @@
 public open class NotNullField : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt
index ad1e4a0fd38..c05114b03f4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullIntArray.txt
@@ -1,4 +1,6 @@
 public open class NotNullIntArray : R|kotlin/Any| {
     public open fun hi(): R|kotlin/IntArray|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt
index 76589c8b193..4e7348745dc 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullMethod.txt
@@ -1,4 +1,6 @@
 public open class NotNullMethod : R|kotlin/Any| {
     public open fun hi(): R|kotlin/String|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt
index a519e47adf4..8db756229d4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullObjectArray.txt
@@ -1,4 +1,6 @@
 public open class NotNullObjectArray : R|kotlin/Any| {
     public open fun hi(): R|kotlin/Array<kotlin/Any>|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt
index 24cae1b04d5..3bac8a4a336 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fromLoadJava/notNull/NotNullParameter.txt
@@ -1,4 +1,6 @@
 public open class NotNullParameter : R|kotlin/Any| {
     public open fun hi(p0: R|kotlin/String|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
index aa35ef59a33..9a3940dcf46 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/DeclaredMemberOverridesDelegated.txt
@@ -1,6 +1,8 @@
 public final class B : R|test/X|, R|test/Y| {
     public open fun foo(): R|kotlin/Unit|
 
+    public constructor(a: R|test/X|)
+
 }
 
 public abstract interface X : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt
index fad0deb10ae..50bfc8680aa 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/InfixKeyword.txt
@@ -1,4 +1,6 @@
 public final class Example : R|kotlin/Any| {
     public final infix fun test(other: R|test/Example|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt
index 682712ca3d9..98d88b48fbb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/OperatorKeyword.txt
@@ -1,4 +1,6 @@
 public final class Example : R|kotlin/Any| {
     public final operator fun plus(other: R|test/Example|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt
index 1a6a4231d47..40251124a62 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateDeepSubclass.txt
@@ -6,9 +6,13 @@ public abstract interface A : R|kotlin/Any| {
 }
 
 public open class B : R|test/A| {
+    public constructor()
+
 }
 
 public final class C : R|test/B| {
     public open fun bar(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt
index 11076a64fdb..271e4960fd5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/PropagateSubclassOfComparable.txt
@@ -1,4 +1,6 @@
 public final class PropagateSubclassOfComparable : R|kotlin/Comparable<test/PropagateSubclassOfComparable>| {
     public open operator fun compareTo(other: R|test/PropagateSubclassOfComparable|): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
index 28a970e4ddf..8a3661e3ffe 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/genericWithoutTypeVariables/FunParamNullable.txt
@@ -1 +1 @@
-public final fun fff(a: R|java/lang/Integer|): R|kotlin/Int|
+public final fun fff(a: R|java/lang/Integer|?): R|kotlin/Int|
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt
index d0dfd94eb3c..f3406d97bd6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFun.txt
@@ -1,4 +1,6 @@
 public final class River : R|kotlin/Any| {
     public final fun song(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt
index e6db9350543..97232b30c0c 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFoo.txt
@@ -1,4 +1,6 @@
 public final class ClassFunGetFoo : R|kotlin/Any| {
     public final fun getFoo(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
index cb3126e1144..5ad8157cf32 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunGetFooSetFoo.txt
@@ -3,4 +3,6 @@ public final class ClassFunGetFoo : R|kotlin/Any| {
 
     public final fun setFoo(p: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt
index 843872b040b..d7fd73b1065 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ClassFunSetFoo.txt
@@ -1,4 +1,6 @@
 public final class ClassFunGetFoo : R|kotlin/Any| {
     public final fun set(p: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFun.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFun.txt
index f94cab5dd8d..4cc1067c439 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFun.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFun.txt
@@ -1,2 +1 @@
 public final fun R|kotlin/Int|.shuffle(): R|kotlin/Int|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt
index fd60dadb010..805eef273bb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ExtFunInClass.txt
@@ -1,4 +1,6 @@
 public final class ExtFunInClass : R|kotlin/Any| {
     public final fun R|kotlin/Int|.shuffle(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt
index 78936b2ac7f..253226e36da 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierAbstract.txt
@@ -1,4 +1,6 @@
 public abstract class ModifierAbstract : R|kotlin/Any| {
     public abstract fun abs(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt
index e7a90770bf8..cb5e52a9954 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ModifierOpen.txt
@@ -1,4 +1,6 @@
 public open class ModifierOpen : R|kotlin/Any| {
     public open fun abs(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt
index b8d59a97a80..0c03c3b8c0b 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/nonGeneric/ReturnTypeNullable.txt
@@ -1 +1 @@
-public final fun ff(): R|java/lang/Integer|
+public final fun ff(): R|java/lang/Integer|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt
index 506acc2ae64..df635265708 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargInt.txt
@@ -1,4 +1,6 @@
 public open class VarargInt : R|kotlin/Any| {
     public open fun vararg(vararg p0: R|kotlin/IntArray|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
index d39e2e1aea8..578a97a0b67 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/fun/vararg/VarargString.txt
@@ -1,4 +1,6 @@
 public open class VarargString : R|kotlin/Any| {
     public open fun vararg(vararg p0: R|kotlin/Array<out kotlin/String>|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
index fe8a180e125..01c33c19922 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/CallablesNameClash.txt
@@ -11,4 +11,6 @@ public final class A : R|kotlin/Any| {
 
     public final fun c(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
index 653a9e66168..815a5f0ddac 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/EnumEntries.txt
@@ -1,2 +1,4 @@
 public final enum class E : R|kotlin/Enum<test/E>| {
+    private constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
index 9480abc8908..5b3fdee9ece 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionMembers.txt
@@ -17,4 +17,6 @@ public final class A : R|kotlin/Any| {
 
     public final fun R|kotlin/String|.f3(): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
index 8ac7e84e909..33411c369ec 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/ExtensionPropertiesNameClash.txt
@@ -1,2 +1,4 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
index a13eb468b46..a1dc62c6bcd 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/memberOrder/InnerClasses.txt
@@ -1,14 +1,24 @@
 public final class O : R|kotlin/Any| {
+    public constructor()
+
     public final class A1 : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final inner class A2 : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final class B1 : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public final inner class B2 : R|kotlin/Any| {
+        public constructor()
+
     }
 
     public abstract interface C1 : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
index 6eb14c6c7fd..a9e34527640 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/DeepInnerGeneric.txt
@@ -1,11 +1,19 @@
 <TA> public final class A : R|kotlin/Any| {
+    public constructor()
+
     <TB> public final inner class B : R|kotlin/Any| {
+        public constructor()
+
         <TC> public final inner class C : R|kotlin/Any| {
+            public constructor()
+
             <TD> public final inner class D : R|kotlin/Any| {
                 public final fun bar(ta: R|TA|, tb: R|TB|, tc: R|TC|, td: R|TD|): R|test/A.B.C.D<TD, TC, TB, TA>|
 
                 <P1, P2, P3, P4> public final fun foo(p1: R|P1|, p2: R|P2|, p3: R|P3|, p4: R|P4|): R|kotlin/Nothing|
 
+                public constructor()
+
             }
 
         }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
index 92d46417fbd..6068d1b5a82 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/InnerClassReferencesOuterTP.txt
@@ -1,5 +1,9 @@
 <P> public final class InnerClassReferencesOuterTP : R|kotlin/Any| {
+    public constructor()
+
     <Q> public final inner class Inner : R|kotlin/Any| {
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
index d8d5cf666a6..3a25d83642a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/nested/MembersReferenceOuterTP.txt
@@ -1,9 +1,13 @@
 <P> public final class MembersReferenceOuterTP : R|kotlin/Any| {
+    public constructor()
+
     public final inner class Inner : R|kotlin/Any| {
         <Q> public final fun f(): R|kotlin/Unit|
 
         public final fun g(p: R|P|): R|P|
 
+        public constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt
index c91ba7801e3..7442705c289 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NotnullTypeArgument.txt
@@ -1,2 +1,4 @@
 public final class C : R|java/util/ArrayList<kotlin/String>| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
index c91ba7801e3..7442705c289 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/platformTypes/NullableTypeArgument.txt
@@ -1,2 +1,4 @@
 public final class C : R|java/util/ArrayList<kotlin/String>| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
index 27db48933af..d00a29f4047 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVal.txt
@@ -1,2 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
index fa4310016df..ce41cfe97c6 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassValAbstract.txt
@@ -1,2 +1,4 @@
 public abstract class ClassValAbstract : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
index cb568c352a1..e68766d8ce9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ClassVar.txt
@@ -1,2 +1,4 @@
 public final class ClassVar : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
index 14fa8fa8149..e66da5b6993 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/Const.txt
@@ -1,8 +1,14 @@
 public final object A : R|kotlin/Any| {
+    private constructor()
+
 }
 
 public final class B : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
index a9d19388965..97d4a8346ca 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValInClass.txt
@@ -1,2 +1,4 @@
 public final class ExtPropInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
index ef9cf8b1cda..1d0a79e55ae 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntListQOfIntInClass.txt
@@ -1,2 +1,4 @@
 public final class ExtValInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
index cb04699e46e..72e46d5314f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTInClass.txt
@@ -1,2 +1,4 @@
 <T> public final class ExtValInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
index 2c5d624e9e9..be7e7239016 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValIntTQInClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ExtValInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
index e44bf38fa1e..074c6b93eea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtValTIntInClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ExtValPIntInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
index a9d19388965..97d4a8346ca 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarInClass.txt
@@ -1,2 +1,4 @@
 public final class ExtPropInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
index 2c5d624e9e9..be7e7239016 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTInClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ExtValInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
index 2c5d624e9e9..be7e7239016 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarIntTQInClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ExtValInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
index e44bf38fa1e..074c6b93eea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTIntInClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ExtValPIntInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
index e44bf38fa1e..074c6b93eea 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/ExtVarTQIntInClass.txt
@@ -1,2 +1,4 @@
 <P> public final class ExtValPIntInClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
index 767cf39481c..481e540c0bf 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/NonConstValWithConstantValueAttribute.txt
@@ -1,11 +1,17 @@
 public final class C : R|kotlin/Any| {
+    public constructor()
+
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
 
 public abstract interface I : R|kotlin/Any| {
     public final companion object Companion : R|kotlin/Any| {
+        private constructor()
+
     }
 
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
index c49fedef845..7ea943006c5 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideClassVal.txt
@@ -1,5 +1,9 @@
 public open class BaseClass : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public open class Subclass : R|test/BaseClass| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
index 67bf38085bc..3ba2c807917 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/OverrideTraitVal.txt
@@ -1,4 +1,6 @@
 public open class Subclass : R|test/Trait| {
+    public constructor()
+
 }
 
 public abstract interface Trait : R|kotlin/Any| {
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
index 885acc6d838..63c732ad236 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/PropFromSuperclass.txt
@@ -1,5 +1,9 @@
 public open class BaseClass : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final class Subclass : R|test/BaseClass| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
index 9040fd35aa9..5a28b4cea9f 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarDelegationToTraitImpl.txt
@@ -2,4 +2,6 @@ public abstract interface A : R|kotlin/Any| {
 }
 
 public final class B : R|test/A| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
index 56b251f3158..72ef63edbf1 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/VarWithDelegated.txt
@@ -1,4 +1,6 @@
 public final class A : R|kotlin/Any| {
+    public constructor()
+
 }
 
 <T> public final class MyProperty : R|kotlin/Any| {
@@ -6,4 +8,6 @@ public final class A : R|kotlin/Any| {
 
     public final operator fun setValue(t: R|T|, p: R|kotlin/reflect/KProperty<*>|, i: R|kotlin/Int|): R|kotlin/Unit|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
index 27db48933af..d00a29f4047 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVal.txt
@@ -1,2 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
index 56545fc6e47..f0046c7a22a 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValParams.txt
@@ -1,2 +1,4 @@
 public final class ClassValParams : R|kotlin/Any| {
+    public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
index 27db48933af..d00a29f4047 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassValWithGet.txt
@@ -1,2 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
index cb568c352a1..e68766d8ce9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVar.txt
@@ -1,2 +1,4 @@
 public final class ClassVar : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
index f1675517198..97c030c9271 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarModality.txt
@@ -1,5 +1,9 @@
 public open class ClassVarModality : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public abstract class ClassVarModalityAbstract : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
index 487b4549760..7f8364c84c2 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarParams.txt
@@ -1,2 +1,4 @@
 public final class ClassVarParams : R|kotlin/Any| {
+    public constructor(pr1: R|kotlin/String|, pr2: R|kotlin/Int|, pr3: R|kotlin/Long|, pr4: R|java/util/Date|, pr5: R|kotlin/Any|, pr6: R|java/lang/Object|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
index 27db48933af..d00a29f4047 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithGet.txt
@@ -1,2 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
index 27db48933af..d00a29f4047 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/prop/defaultAccessors/ClassVarWithSet.txt
@@ -1,2 +1,4 @@
 public final class ClassVal : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt
index ce5a18f2797..166b37989eb 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/AnyQ.txt
@@ -1 +1 @@
-public final fun anyq(): R|kotlin/Any|
+public final fun anyq(): R|kotlin/Any|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt
index b2608ab8cf2..b8e7f5fc4c9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/IntQ.txt
@@ -1 +1 @@
-public final fun fff(): R|kotlin/Int|
+public final fun fff(): R|kotlin/Int|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt
index 677ed558902..3a80d986df0 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlIntegerQ.txt
@@ -1 +1 @@
-public final fun integerq(): R|java/lang/Integer|
+public final fun integerq(): R|java/lang/Integer|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt
index b5e8ef1dd29..ee7eca57acf 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlObjectQ.txt
@@ -1 +1 @@
-public final fun objq(): R|java/lang/Object|
+public final fun objq(): R|java/lang/Object|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt
index 12da2092007..d88d578e566 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/JlStringQ.txt
@@ -1 +1 @@
-public final fun fff(): R|java/lang/String|
+public final fun fff(): R|java/lang/String|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt
index cea4de91392..60dc66fe3b9 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/NothingQ.txt
@@ -1 +1 @@
-public final fun nothingq(): R|kotlin/Nothing|
+public final fun nothingq(): R|kotlin/Nothing|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt
index 0645d07f54b..cda913d1422 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/Platform.txt
@@ -1,5 +1,5 @@
-public final fun array(a: R|kotlin/Array<kotlin/Int>|): R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int>>>|
+public final fun array(a: R|kotlin/Array<kotlin/Int>|): R|ft<kotlin/Array<ft<kotlin/Int, kotlin/Int?>>, kotlin/Array<out ft<kotlin/Int, kotlin/Int?>>?>|!
 
-public final fun list(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String>>, kotlin/collections/List<ft<kotlin/String, kotlin/String>>>|
+public final fun list(): R|ft<kotlin/collections/MutableList<ft<kotlin/String, kotlin/String?>>, kotlin/collections/List<ft<kotlin/String, kotlin/String?>>?>|!
 
-public final fun printStream(): R|ft<java/io/PrintStream, java/io/PrintStream>|
+public final fun printStream(): R|ft<java/io/PrintStream, java/io/PrintStream?>|!
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt
index 64e2d6f5c12..e7c1507e950 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/StringQ.txt
@@ -1 +1 @@
-public final fun fff(): R|kotlin/String|
+public final fun fff(): R|kotlin/String|?
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt
index df75c488709..a7d3f85121d 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/type/SuspendFunction.txt
@@ -5,4 +5,3 @@ public final fun test2(): R|error: createSuspendFunctionType not supported|
 public final fun test3(): R|kotlin/collections/List<error: createSuspendFunctionType not supported>|
 
 public final fun test4(): R|error: createSuspendFunctionType not supported|
-
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
index e3a7e6518ce..ddb4a870e6e 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/Annotations.txt
@@ -1,2 +1,4 @@
 public final annotation class Ann : R|kotlin/Annotation| {
+    public constructor(value: R|kotlin/String|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
index 7c01a03386d..b0193959568 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/typealias/TypeAliasToExtension.txt
@@ -1,4 +1,6 @@
 <P> public final fun foo(x: R|kotlin/Function1<test/Foo<P>, kotlin/Unit>|): R|kotlin/Unit|
 
 <T> public final class Foo : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt
index 0c04bfe0a60..b003a781972 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalClass.txt
@@ -1,2 +1,4 @@
 internal final class InternalClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt
index 6c010fb5ccd..d09cb1e88db 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/InternalConstructor.txt
@@ -1,2 +1,4 @@
 public final class InternalConstructor : R|kotlin/Any| {
+    internal constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt
index 482ab41bca3..5c46ec705a4 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClass.txt
@@ -1,2 +1,4 @@
 private final class PrivateClass : R|kotlin/Any| {
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
index de801d6f4ae..469cb741016 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateClassMembers.txt
@@ -1,4 +1,6 @@
 public final class PrivateClassMembers : R|kotlin/Any| {
     private final fun f(): R|kotlin/Int|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
index 5dc6fe446c5..3c34c354644 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PrivateToThis.txt
@@ -1,4 +1,6 @@
 <I> public final class A : R|kotlin/Any| {
     private/*private to this*/ final fun bas(): R|I|
 
+    public constructor()
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
index f53a4fe43cd..4a9f75d9ebf 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructor.txt
@@ -1,5 +1,9 @@
 public open class Base : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final class Child : R|test/Base| {
+    public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|)
+
 }
diff --git a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
index f53a4fe43cd..4a9f75d9ebf 100644
--- a/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
+++ b/compiler/fir/resolve/testData/loadCompiledKotlin/visibility/PropertyInConstructorExplicitVisibility.txt
@@ -1,5 +1,9 @@
 public open class Base : R|kotlin/Any| {
+    public constructor()
+
 }
 
 public final class Child : R|test/Base| {
+    public constructor(prot: R|kotlin/Int|, int: R|kotlin/Int|, pub: R|kotlin/Int|)
+
 }