From 5262f0a53fada734e3984f212784135e5abed8c0 Mon Sep 17 00:00:00 2001
From: Mikhail Glukhikh <mikhail.glukhikh@jetbrains.com>
Date: Fri, 26 Apr 2019 13:07:09 +0300
Subject: [PATCH] Fir2Ir: apply major text data update after a bunch of resolve
 changes

---
 .../irText/classes/annotationClasses.fir.txt  |   7 +-
 ...rderingInDelegatingConstructorCall.fir.txt |   1 +
 .../ir/irText/classes/classMembers.fir.txt    |  22 +-
 .../ir/irText/classes/classes.fir.txt         |   1 +
 .../classes/dataClassWithArrayMembers.fir.txt |  62 +++++-
 .../ir/irText/classes/dataClasses.fir.txt     |  41 ++++
 .../irText/classes/dataClassesGeneric.fir.txt |  39 +++-
 .../classes/delegatedImplementation.fir.txt   | 201 +++++++++---------
 ...ImplementationWithExplicitOverride.fir.txt |  59 ++---
 ...structorCallToTypeAliasConstructor.fir.txt |  11 +-
 ...ructorCallsInSecondaryConstructors.fir.txt |   1 +
 .../testData/ir/irText/classes/enum.fir.txt   |  13 +-
 .../irText/classes/enumClassModality.fir.txt  |   1 +
 .../classes/enumWithSecondaryCtor.fir.txt     |   9 +-
 .../ir/irText/classes/initBlock.fir.txt       |  17 +-
 .../ir/irText/classes/initVal.fir.txt         |   1 +
 .../ir/irText/classes/initVar.fir.txt         |   1 +
 .../ir/irText/classes/inlineClass.fir.txt     |   1 +
 .../ir/irText/classes/innerClass.fir.txt      |   1 +
 ...nnerClassWithDelegatingConstructor.fir.txt |   1 +
 .../lambdaInDataClassDefaultParameter.fir.txt |  36 ++--
 .../ir/irText/classes/localClasses.fir.txt    |  16 +-
 .../classes/objectLiteralExpressions.fir.txt  |  44 ++--
 .../classes/objectWithInitializers.fir.txt    |   1 +
 .../irText/classes/outerClassAccess.fir.txt   |   3 +-
 .../irText/classes/primaryConstructor.fir.txt |  13 +-
 ...onstructorWithSuperConstructorCall.fir.txt |   1 +
 .../classes/qualifiedSuperCalls.fir.txt       |   9 +-
 .../ir/irText/classes/sealedClasses.fir.txt   |   1 +
 ...uctorWithInitializersFromClassBody.fir.txt |   1 +
 .../ir/irText/classes/superCalls.fir.txt      |   5 +-
 .../annotationsInAnnotationArguments.fir.txt  |   1 +
 ...otationsWithDefaultParameterValues.fir.txt |   1 +
 .../annotationsWithVarargParameters.fir.txt   |   7 +-
 .../arrayInAnnotationArguments.fir.txt        |   1 +
 .../classLiteralInAnnotation.fir.txt          |  10 +-
 .../classesWithAnnotations.fir.txt            |   1 +
 ...stExpressionsInAnnotationArguments.fir.txt |   1 +
 .../constructorsWithAnnotations.fir.txt       |   1 +
 .../delegateFieldWithAnnotations.fir.txt      |   1 +
 ...edPropertyAccessorsWithAnnotations.fir.txt |   1 +
 .../enumEntriesWithAnnotations.fir.txt        |   1 +
 .../enumsInAnnotationArguments.fir.txt        |   1 +
 .../annotations/fieldsWithAnnotations.fir.txt |   1 +
 .../annotations/fileAnnotations.fir.txt       |   1 +
 .../functionsWithAnnotations.fir.txt          |   1 +
 .../annotations/javaAnnotation.fir.txt        |   1 +
 ...DelegatedPropertiesWithAnnotations.fir.txt |   1 +
 ...ultipleAnnotationsInSquareBrackets.fir.txt |   1 +
 ...onstructorParameterWithAnnotations.fir.txt |   1 +
 .../propertiesWithAnnotations.fir.txt         |   1 +
 ...sorsFromClassHeaderWithAnnotations.fir.txt |   1 +
 .../propertyAccessorsWithAnnotations.fir.txt  |   1 +
 ...ertySetterParameterWithAnnotations.fir.txt |   1 +
 .../receiverParameterWithAnnotations.fir.txt  |   1 +
 ...preadOperatorInAnnotationArguments.fir.txt |   7 +-
 .../typeAliasesWithAnnotations.fir.txt        |   1 +
 .../typeParametersWithAnnotations.fir.txt     |   1 +
 .../valueParametersWithAnnotations.fir.txt    |  11 +-
 .../varargsInAnnotationArguments.fir.txt      |  19 +-
 .../variablesWithAnnotations.fir.txt          |   1 +
 .../catchParameterInTopLevelProperty.fir.txt  |   1 +
 .../declarations/classLevelProperties.fir.txt |   1 +
 .../declarations/constValInitializers.fir.txt |  11 +-
 .../declarations/delegatedProperties.fir.txt  |   1 +
 .../declarations/extensionProperties.fir.txt  |   1 +
 .../irText/declarations/fakeOverrides.fir.txt |  21 +-
 .../declarations/fileWithAnnotations.fir.txt  |   1 +
 .../ir/irText/declarations/kt27005.fir.txt    |  13 +-
 .../ir/irText/declarations/kt29833.fir.txt    |  21 +-
 .../localClassWithOverrides.fir.txt           |  14 +-
 .../localDelegatedProperties.fir.txt          |   1 +
 .../declarations/localVarInDoWhile.fir.txt    |   1 +
 .../expectClassInherited.fir.txt              |   1 +
 .../multiplatform/expectedEnumClass.fir.txt   |   1 +
 .../multiplatform/expectedSealedClass.fir.txt |   1 +
 .../packageLevelProperties.fir.txt            |   1 +
 .../declarations/parameters/class.fir.txt     |   7 +-
 .../parameters/constructor.fir.txt            |  33 +--
 .../parameters/dataClassMembers.fir.txt       |  17 +-
 .../defaultPropertyAccessors.fir.txt          |   7 +-
 .../parameters/delegatedMembers.fir.txt       |  45 ++--
 .../declarations/parameters/fun.fir.txt       |   5 +-
 .../parameters/genericInnerClass.fir.txt      |   5 +-
 .../declarations/parameters/lambdas.fir.txt   |  38 ++--
 .../declarations/parameters/localFun.fir.txt  |   5 +-
 .../parameters/propertyAccessors.fir.txt      |   3 +-
 .../typeParameterBeforeBound.fir.txt          |   3 +-
 .../typeParameterBoundedBySubclass.fir.txt    |   3 +-
 .../differentReceivers.fir.txt                |   3 +-
 .../provideDelegate/local.fir.txt             |   1 +
 .../localDifferentReceivers.fir.txt           |   3 +-
 .../provideDelegate/member.fir.txt            |   1 +
 .../provideDelegate/memberExtension.fir.txt   |   8 +-
 .../provideDelegate/topLevel.fir.txt          |   1 +
 .../errors/suppressedNonPublicCall.fir.txt    |   1 +
 .../irText/errors/unresolvedReference.fir.txt |   1 +
 .../argumentMappedWithError.fir.txt           |   3 +-
 .../ir/irText/expressions/arrayAccess.fir.txt |   7 +-
 .../expressions/arrayAssignment.fir.txt       |   1 +
 .../arrayAugmentedAssignment1.fir.txt         |   4 +-
 .../arrayAugmentedAssignment2.fir.txt         |   1 +
 .../ir/irText/expressions/assignments.fir.txt |   1 +
 .../expressions/augmentedAssignment1.fir.txt  |   1 +
 .../expressions/augmentedAssignment2.fir.txt  |   1 +
 .../augmentedAssignmentWithExpression.fir.txt |   5 +-
 .../expressions/badBreakContinue.fir.txt      |   7 +-
 .../ir/irText/expressions/bangbang.fir.txt    |  25 +--
 .../booleanConstsInAndAndOrOr.fir.txt         |   1 +
 .../expressions/booleanOperators.fir.txt      |   1 +
 .../boundCallableReferences.fir.txt           |   1 +
 .../irText/expressions/breakContinue.fir.txt  |   1 +
 .../breakContinueInLoopHeader.fir.txt         |  17 +-
 .../callWithReorderedArguments.fir.txt        |   1 +
 .../callableRefToGenericMember.fir.txt        |   3 +-
 ...lableReferenceToImportedFromObject.fir.txt |   1 +
 .../callableReferenceTypeArguments.fir.txt    |  25 +--
 .../ir/irText/expressions/calls.fir.txt       |   3 +-
 .../expressions/castToTypeParameter.fir.txt   |   3 +-
 .../expressions/catchParameterAccess.fir.txt  |   7 +-
 .../expressions/chainOfSafeCalls.fir.txt      |   7 +-
 .../irText/expressions/classReference.fir.txt |  11 +-
 .../irText/expressions/coercionToUnit.fir.txt |  28 +--
 .../complexAugmentedAssignment.fir.txt        |  31 +--
 ...nstructorWithOwnTypeParametersCall.fir.txt |  10 +-
 .../expressions/conventionComparisons.fir.txt |   1 +
 .../irText/expressions/destructuring1.fir.txt |   5 +-
 .../destructuringWithUnderscore.fir.txt       |   5 +-
 .../irText/expressions/dotQualified.fir.txt   |  13 +-
 .../ir/irText/expressions/elvis.fir.txt       |  33 +--
 .../expressions/enumEntryAsReceiver.fir.txt   |   6 +-
 ...umEntryReferenceFromEnumEntryClass.fir.txt |  19 +-
 .../expressions/extFunInvokeAsFun.fir.txt     |  13 +-
 .../expressions/extFunSafeInvoke.fir.txt      |   7 +-
 .../extensionPropertyGetterCall.fir.txt       |   7 +-
 .../ir/irText/expressions/field.fir.txt       |   1 +
 .../comparableWithDoubleOrFloat.fir.txt       |   1 +
 ...eqRhsConditionPossiblyAffectingLhs.fir.txt |   7 +-
 .../floatingPointCompareTo.fir.txt            |  33 +--
 .../floatingPointEqeq.fir.txt                 |   1 +
 .../floatingPointEquals.fir.txt               | 113 +++++-----
 .../floatingPointExcleq.fir.txt               |   1 +
 .../floatingPointLess.fir.txt                 |   1 +
 .../nullableAnyAsIntToDouble.fir.txt          |   1 +
 .../nullableFloatingPointEqeq.fir.txt         |   1 +
 ...meterWithPrimitiveNumericSupertype.fir.txt |   3 +-
 .../whenByFloatingPoint.fir.txt               |   7 +-
 .../ir/irText/expressions/for.fir.txt         |  49 ++---
 .../expressions/forWithBreakContinue.fir.txt  |  49 ++---
 .../forWithImplicitReceivers.fir.txt          |  14 +-
 .../expressions/funImportedFromObject.fir.txt |   1 +
 ...icConstructorCallWithTypeArguments.fir.txt |  29 ++-
 .../expressions/genericPropertyCall.fir.txt   |   1 +
 .../expressions/genericPropertyRef.fir.txt    |   9 +-
 .../ir/irText/expressions/ifElseIf.fir.txt    |   1 +
 ...mplicitCastInReturnFromConstructor.fir.txt |   3 +-
 .../expressions/implicitCastToNonNull.fir.txt |  27 +--
 .../implicitCastToTypeParameter.fir.txt       |   7 +-
 .../testData/ir/irText/expressions/in.fir.txt |   5 +-
 .../expressions/incrementDecrement.fir.txt    |  45 ++--
 .../expressions/interfaceThisRef.fir.txt      |   1 +
 .../javaSyntheticPropertyAccess.fir.txt       |  15 +-
 .../jvmInstanceFieldReference.fir.txt         |  50 +----
 .../jvmStaticFieldReference.fir.txt           |  21 +-
 .../ir/irText/expressions/kt16904.fir.txt     |  50 +----
 .../ir/irText/expressions/kt16905.fir.txt     |   1 +
 .../ir/irText/expressions/kt23030.fir.txt     |   1 +
 .../ir/irText/expressions/kt24804.fir.txt     |   1 +
 .../ir/irText/expressions/kt27933.fir.txt     |   1 +
 .../ir/irText/expressions/kt28006.fir.txt     |   5 +-
 .../ir/irText/expressions/kt28456.fir.txt     |  10 +-
 .../ir/irText/expressions/kt28456a.fir.txt    |   7 +-
 .../ir/irText/expressions/kt28456b.fir.txt    |  14 +-
 .../ir/irText/expressions/kt30020.fir.txt     | 119 ++++-------
 .../ir/irText/expressions/lambdaInCAO.fir.txt |  40 ++--
 .../ir/irText/expressions/literals.fir.txt    |  17 +-
 .../expressions/memberTypeArguments.fir.txt   |  11 +-
 .../membersImportedFromObject.fir.txt         |   1 +
 .../multipleThisReferences.fir.txt            |   9 +-
 .../expressions/objectAsCallable.fir.txt      |  14 +-
 .../expressions/objectClassReference.fir.txt  |   7 +-
 .../expressions/objectReference.fir.txt       |  25 ++-
 ...nceInClosureInSuperConstructorCall.fir.txt |  20 +-
 .../objectReferenceInFieldInitializer.fir.txt |   1 +
 .../outerClassInstanceReference.fir.txt       |   1 +
 .../expressions/primitiveComparisons.fir.txt  |   1 +
 .../primitivesImplicitConversions.fir.txt     |   1 +
 .../expressions/propertyReferences.fir.txt    |  41 ++--
 .../ir/irText/expressions/references.fir.txt  |   7 +-
 .../expressions/reflectionLiterals.fir.txt    |  33 +--
 .../irText/expressions/safeAssignment.fir.txt |   1 +
 .../safeCallWithIncrementDecrement.fir.txt    |   6 +-
 .../ir/irText/expressions/safeCalls.fir.txt   |  19 +-
 .../expressions/sam/samConstructors.fir.txt   |  17 +-
 .../expressions/sam/samConversions.fir.txt    |  43 ++--
 .../sam/samConversionsWithSmartCasts.fir.txt  |  63 +++---
 .../expressions/sam/samOperators.fir.txt      |   1 +
 .../setFieldWithImplicitCast.fir.txt          |  50 +----
 ...edToUnsignedConversions_annotation.fir.txt |   1 +
 .../signedToUnsignedConversions_test.fir.txt  |  35 +--
 .../expressions/simpleOperators.fir.txt       |  89 ++++----
 .../expressions/simpleUnaryOperators.fir.txt  |  13 +-
 .../ir/irText/expressions/smartCasts.fir.txt  |  15 +-
 .../smartCastsWithDestructuring.fir.txt       |   5 +-
 ...pecializedTypeAliasConstructorCall.fir.txt |  14 +-
 .../expressions/stringComparisons.fir.txt     |   1 +
 .../ir/irText/expressions/stringPlus.fir.txt  |   1 +
 .../expressions/stringTemplates.fir.txt       |   1 +
 .../temporaryInEnumEntryInitializer.fir.txt   |   3 +-
 .../expressions/temporaryInInitBlock.fir.txt  |   3 +-
 .../thisOfGenericOuterClass.fir.txt           |  26 +--
 .../thisReferenceBeforeClassDeclared.fir.txt  |  11 +-
 .../ir/irText/expressions/throw.fir.txt       |   3 +-
 .../ir/irText/expressions/tryCatch.fir.txt    |   1 +
 .../tryCatchWithImplicitCast.fir.txt          |   1 +
 .../irText/expressions/typeArguments.fir.txt  |   3 +-
 .../typeParameterClassLiteral.fir.txt         |  29 +--
 .../unsignedIntegerLiterals.fir.txt           |  41 ++--
 .../expressions/useImportedMember.fir.txt     |  13 +-
 .../ir/irText/expressions/values.fir.txt      |  19 +-
 .../ir/irText/expressions/vararg.fir.txt      |  35 +--
 .../varargWithImplicitCast.fir.txt            |   9 +-
 .../variableAsFunctionCall.fir.txt            |  28 +--
 ...variableAsFunctionCallWithGenerics.fir.txt |  26 +--
 .../ir/irText/expressions/when.fir.txt        |   9 +-
 .../expressions/whenCoercedToUnit.fir.txt     |   1 +
 .../ir/irText/expressions/whenReturn.fir.txt  |   1 +
 .../whenWithSubjectVariable.fir.txt           |  27 +--
 .../irText/expressions/whileDoWhile.fir.txt   |   1 +
 .../irText/lambdas/anonymousFunction.fir.txt  |   1 +
 .../lambdas/destructuringInLambda.fir.txt     |  47 ++--
 .../ir/irText/lambdas/extensionLambda.fir.txt |  17 +-
 .../ir/irText/lambdas/justLambda.fir.txt      |   7 +-
 .../ir/irText/lambdas/localFunction.fir.txt   |   1 +
 .../lambdas/multipleImplicitReceivers.fir.txt |  43 ++--
 .../ir/irText/lambdas/nonLocalReturn.fir.txt  | 122 +++++------
 .../ir/irText/lambdas/samAdapter.fir.txt      |   8 +-
 .../irText/regressions/coercionInLoop.fir.txt |  18 +-
 .../regressions/integerCoercionToT.fir.txt    |   5 +-
 .../ir/irText/regressions/kt24114.fir.txt     |   1 +
 .../newInference/fixationOrder1.fir.txt       |  23 +-
 .../typeAliasCtorForGenericClass.fir.txt      |  18 +-
 .../ir/irText/singletons/companion.fir.txt    |   3 +-
 .../ir/irText/singletons/enumEntry.fir.txt    |   1 +
 .../ir/irText/singletons/object.fir.txt       |   1 +
 .../ir/irText/stubs/builtinMap.fir.txt        |  17 +-
 .../ir/irText/stubs/constFromBuiltins.fir.txt |  11 +-
 .../genericClassInDifferentModule_m1.fir.txt  |   7 +-
 .../genericClassInDifferentModule_m2.fir.txt  |  13 +-
 .../javaConstructorWithTypeParameters.fir.txt |  13 +-
 .../testData/ir/irText/stubs/javaEnum.fir.txt |  11 +-
 .../ir/irText/stubs/javaInnerClass.fir.txt    |  50 +----
 .../ir/irText/stubs/javaMethod.fir.txt        |   1 +
 .../ir/irText/stubs/javaNestedClass.fir.txt   |   1 +
 .../stubs/javaSyntheticProperty.fir.txt       |   1 +
 .../stubs/jdkClassSyntheticProperty.fir.txt   |   1 +
 .../ir/irText/stubs/kotlinInnerClass.fir.txt  |   1 +
 .../testData/ir/irText/stubs/simple.fir.txt   |  13 +-
 .../ir/irText/types/intersectionType1.fir.txt |  21 +-
 .../ir/irText/types/intersectionType2.fir.txt |  37 ++--
 .../ir/irText/types/intersectionType3.fir.txt |   1 +
 .../localVariableOfIntersectionType.fir.txt   |   1 +
 262 files changed, 1776 insertions(+), 1636 deletions(-)

diff --git a/compiler/testData/ir/irText/classes/annotationClasses.fir.txt b/compiler/testData/ir/irText/classes/annotationClasses.fir.txt
index 9dee4a4813e..6f3ad78546c 100644
--- a/compiler/testData/ir/irText/classes/annotationClasses.fir.txt
+++ b/compiler/testData/ir/irText/classes/annotationClasses.fir.txt
@@ -87,12 +87,12 @@ FILE fqName:<root> fileName:/annotationClasses.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS ANNOTATION_CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test4 
-    CONSTRUCTOR visibility:public <> (xs:kotlin.Int) returnType:<root>.Test4 [primary] 
-      VALUE_PARAMETER name:xs index:0 type:kotlin.Int 
+    CONSTRUCTOR visibility:public <> (xs:kotlin.IntArray) returnType:<root>.Test4 [primary] 
+      VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray 
     PROPERTY name:xs visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Int visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'xs: kotlin.Int declared in <root>.Test4.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'xs: kotlin.IntArray declared in <root>.Test4.<init>' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:<root>.Test4) returnType:kotlin.Int 
         correspondingProperty: PROPERTY name:xs visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test4 
@@ -113,3 +113,4 @@ FILE fqName:<root> fileName:/annotationClasses.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.fir.txt b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.fir.txt
index 54588af4c26..ed77333f8c3 100644
--- a/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.fir.txt
+++ b/compiler/testData/ir/irText/classes/argumentReorderingInDelegatingConstructorCall.fir.txt
@@ -94,3 +94,4 @@ FILE fqName:<root> fileName:/argumentReorderingInDelegatingConstructorCall.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/classMembers.fir.txt b/compiler/testData/ir/irText/classes/classMembers.fir.txt
index 57476b2a7ba..43924a3ebf6 100644
--- a/compiler/testData/ir/irText/classes/classMembers.fir.txt
+++ b/compiler/testData/ir/irText/classes/classMembers.fir.txt
@@ -70,24 +70,23 @@ FILE fqName:<root> fileName:/classMembers.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.C 
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-propertyWithGetAndSet> (): kotlin.Int declared in <root>.C'
-            CALL 'public final fun <get-z> (): kotlin.Int declared in <root>.C' type=kotlin.Int origin=null
+            GET_VAR 'z: kotlin.Int declared in <root>.C.<init>' type=kotlin.Int origin=null
       FUN name:<set-propertyWithGetAndSet> visibility:public modality:FINAL <> ($this:<root>.C, value:kotlin.Int) returnType:kotlin.Unit 
         correspondingProperty: PROPERTY name:propertyWithGetAndSet visibility:public modality:FINAL [var] 
         $this: VALUE_PARAMETER name:<this> type:<root>.C 
         VALUE_PARAMETER name:value index:0 type:kotlin.Int 
         BLOCK_BODY
-          SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
-            value: GET_VAR 'value: kotlin.Int declared in <root>.C.<set-propertyWithGetAndSet>' type=kotlin.Int origin=null
+          ERROR_CALL 'Unresolved reference: R|<local>/z|' type=IrErrorType
     FUN name:function visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Unit 
       $this: VALUE_PARAMETER name:<this> type:<root>.C 
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-          CONST String type=kotlin.String value="1"
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="1"
     FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Unit 
       $this: VALUE_PARAMETER name:<this> type:<root>.C 
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-          CONST String type=kotlin.String value="2"
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="2"
     CLASS CLASS name:NestedClass modality:FINAL visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C.NestedClass 
       CONSTRUCTOR visibility:public <> () returnType:<root>.C.NestedClass [primary] 
@@ -97,13 +96,13 @@ FILE fqName:<root> fileName:/classMembers.kt
       FUN name:function visibility:public modality:FINAL <> ($this:<root>.C.NestedClass) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedClass 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            CONST String type=kotlin.String value="3"
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="3"
       FUN name:memberExtensionFunction visibility:public modality:FINAL <> ($this:<root>.C.NestedClass) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.C.NestedClass 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            CONST String type=kotlin.String value="4"
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="4"
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -171,3 +170,4 @@ FILE fqName:<root> fileName:/classMembers.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/classes.fir.txt b/compiler/testData/ir/irText/classes/classes.fir.txt
index e9e81b67dd2..7919ff0619b 100644
--- a/compiler/testData/ir/irText/classes/classes.fir.txt
+++ b/compiler/testData/ir/irText/classes/classes.fir.txt
@@ -96,3 +96,4 @@ FILE fqName:<root> fileName:/classes.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt
index 79efe43aefe..7edaedcc608 100644
--- a/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt
+++ b/compiler/testData/ir/irText/classes/dataClassWithArrayMembers.fir.txt
@@ -113,6 +113,51 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-doubleArray> (): kotlin.DoubleArray declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:doubleArray type:kotlin.DoubleArray visibility:public [final] ' type=kotlin.DoubleArray origin=null
               receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-doubleArray>' type=<root>.Test1 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Array<kotlin.String> 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Array<kotlin.String> declared in <root>.Test1'
+          CALL 'public final fun <get-stringArray> (): kotlin.Array<kotlin.String> declared in <root>.Test1' type=kotlin.Array<kotlin.String> origin=null
+    FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.CharArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.CharArray declared in <root>.Test1'
+          CALL 'public final fun <get-charArray> (): kotlin.CharArray declared in <root>.Test1' type=kotlin.CharArray origin=null
+    FUN name:component3 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.BooleanArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component3 (): kotlin.BooleanArray declared in <root>.Test1'
+          CALL 'public final fun <get-booleanArray> (): kotlin.BooleanArray declared in <root>.Test1' type=kotlin.BooleanArray origin=null
+    FUN name:component4 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.ByteArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component4 (): kotlin.ByteArray declared in <root>.Test1'
+          CALL 'public final fun <get-byteArray> (): kotlin.ByteArray declared in <root>.Test1' type=kotlin.ByteArray origin=null
+    FUN name:component5 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.ShortArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component5 (): kotlin.ShortArray declared in <root>.Test1'
+          CALL 'public final fun <get-shortArray> (): kotlin.ShortArray declared in <root>.Test1' type=kotlin.ShortArray origin=null
+    FUN name:component6 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.IntArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component6 (): kotlin.IntArray declared in <root>.Test1'
+          CALL 'public final fun <get-intArray> (): kotlin.IntArray declared in <root>.Test1' type=kotlin.IntArray origin=null
+    FUN name:component7 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.LongArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component7 (): kotlin.LongArray declared in <root>.Test1'
+          CALL 'public final fun <get-longArray> (): kotlin.LongArray declared in <root>.Test1' type=kotlin.LongArray origin=null
+    FUN name:component8 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.FloatArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component8 (): kotlin.FloatArray declared in <root>.Test1'
+          CALL 'public final fun <get-floatArray> (): kotlin.FloatArray declared in <root>.Test1' type=kotlin.FloatArray origin=null
+    FUN name:component9 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.DoubleArray 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component9 (): kotlin.DoubleArray declared in <root>.Test1'
+          CALL 'public final fun <get-doubleArray> (): kotlin.DoubleArray declared in <root>.Test1' type=kotlin.DoubleArray origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -129,15 +174,15 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
   CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (genericArray:kotlin.Array<T of <root>.Test2>) returnType:<root>.Test2<T of <root>.Test2> [primary] 
-      VALUE_PARAMETER name:genericArray index:0 type:kotlin.Array<T of <root>.Test2> 
+    CONSTRUCTOR visibility:public <> (genericArray:kotlin.Array<T of <uninitialized parent>>) returnType:<root>.Test2<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:genericArray index:0 type:kotlin.Array<T of <uninitialized parent>> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:genericArray visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'genericArray: kotlin.Array<T of <root>.Test2> declared in <root>.Test2.<init>' type=kotlin.Array<T of <root>.Test2> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'genericArray: kotlin.Array<T of <uninitialized parent>> declared in <root>.Test2.<init>' type=kotlin.Array<T of <uninitialized parent>> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-genericArray> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Array<T of <root>.Test2> 
         correspondingProperty: PROPERTY name:genericArray visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test2 
@@ -145,6 +190,11 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-genericArray> (): kotlin.Array<T of <root>.Test2> declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:genericArray type:kotlin.Array<T of <root>.Test2> visibility:public [final] ' type=kotlin.Array<T of <root>.Test2> origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-genericArray>' type=<root>.Test2 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Array<T of <root>.Test2> 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Array<T of <root>.Test2> declared in <root>.Test2'
+          CALL 'public final fun <get-genericArray> (): kotlin.Array<T of <root>.Test2> declared in <root>.Test2' type=kotlin.Array<T of <root>.Test2> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -176,6 +226,11 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-anyArrayN> (): kotlin.Array<kotlin.Any>? declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anyArrayN type:kotlin.Array<kotlin.Any>? visibility:public [final] ' type=kotlin.Array<kotlin.Any>? origin=null
               receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-anyArrayN>' type=<root>.Test3 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Array<kotlin.Any>? 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Array<kotlin.Any>? declared in <root>.Test3'
+          CALL 'public final fun <get-anyArrayN> (): kotlin.Array<kotlin.Any>? declared in <root>.Test3' type=kotlin.Array<kotlin.Any>? origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -189,3 +244,4 @@ FILE fqName:<root> fileName:/dataClassWithArrayMembers.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/dataClasses.fir.txt b/compiler/testData/ir/irText/classes/dataClasses.fir.txt
index f6309d0cd87..bd4d5334525 100644
--- a/compiler/testData/ir/irText/classes/dataClasses.fir.txt
+++ b/compiler/testData/ir/irText/classes/dataClasses.fir.txt
@@ -41,6 +41,21 @@ FILE fqName:<root> fileName:/dataClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-z> (): kotlin.Any declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:kotlin.Any visibility:public [final] ' type=kotlin.Any origin=null
               receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-z>' type=<root>.Test1 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Int 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in <root>.Test1'
+          CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.Test1' type=kotlin.Int origin=null
+    FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.String 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.String declared in <root>.Test1'
+          CALL 'public final fun <get-y> (): kotlin.String declared in <root>.Test1' type=kotlin.String origin=null
+    FUN name:component3 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:kotlin.Any 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component3 (): kotlin.Any declared in <root>.Test1'
+          CALL 'public final fun <get-z> (): kotlin.Any declared in <root>.Test1' type=kotlin.Any origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -72,6 +87,11 @@ FILE fqName:<root> fileName:/dataClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any? declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any? visibility:public [final] ' type=kotlin.Any? origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Any? 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Any? declared in <root>.Test2'
+          CALL 'public final fun <get-x> (): kotlin.Any? declared in <root>.Test2' type=kotlin.Any? origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -139,6 +159,26 @@ FILE fqName:<root> fileName:/dataClasses.kt
           RETURN type=kotlin.Nothing from='public final fun <get-df> (): kotlin.Float? declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:df type:kotlin.Float? visibility:public [final] ' type=kotlin.Float? origin=null
               receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-df>' type=<root>.Test3 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Double 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Double declared in <root>.Test3'
+          CALL 'public final fun <get-d> (): kotlin.Double declared in <root>.Test3' type=kotlin.Double origin=null
+    FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Double? 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Double? declared in <root>.Test3'
+          CALL 'public final fun <get-dn> (): kotlin.Double? declared in <root>.Test3' type=kotlin.Double? origin=null
+    FUN name:component3 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Float 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component3 (): kotlin.Float declared in <root>.Test3'
+          CALL 'public final fun <get-f> (): kotlin.Float declared in <root>.Test3' type=kotlin.Float origin=null
+    FUN name:component4 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.Float? 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component4 (): kotlin.Float? declared in <root>.Test3'
+          CALL 'public final fun <get-df> (): kotlin.Float? declared in <root>.Test3' type=kotlin.Float? origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -152,3 +192,4 @@ FILE fqName:<root> fileName:/dataClasses.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt
index 67d4fd5fe98..26d0940c623 100644
--- a/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt
+++ b/compiler/testData/ir/irText/classes/dataClassesGeneric.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
   CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Test1) returnType:<root>.Test1<T of <root>.Test1> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Test1 
+    CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Test1<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: T of <root>.Test1 declared in <root>.Test1.<init>' type=T of <root>.Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: T of <uninitialized parent> declared in <root>.Test1.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:T of <root>.Test1 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
@@ -18,6 +18,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): T of <root>.Test1 declared in <root>.Test1'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test1 visibility:public [final] ' type=T of <root>.Test1 origin=null
               receiver: GET_VAR '<this>: <root>.Test1 declared in <root>.Test1.<get-x>' type=<root>.Test1 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:T of <root>.Test1 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): T of <root>.Test1 declared in <root>.Test1'
+          CALL 'public final fun <get-x> (): T of <root>.Test1 declared in <root>.Test1' type=T of <root>.Test1 origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -34,15 +39,15 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
   CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Test2) returnType:<root>.Test2<T of <root>.Test2> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Test2 
+    CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Test2<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: T of <root>.Test2 declared in <root>.Test2.<init>' type=T of <root>.Test2 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: T of <uninitialized parent> declared in <root>.Test2.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:T of <root>.Test2 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test2 
@@ -50,6 +55,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): T of <root>.Test2 declared in <root>.Test2'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test2 visibility:public [final] ' type=T of <root>.Test2 origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:T of <root>.Test2 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test2 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): T of <root>.Test2 declared in <root>.Test2'
+          CALL 'public final fun <get-x> (): T of <root>.Test2 declared in <root>.Test2' type=T of <root>.Test2 origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -66,15 +76,15 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
   CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test3 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:kotlin.collections.List<T of <root>.Test3>) returnType:<root>.Test3<T of <root>.Test3> [primary] 
-      VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<T of <root>.Test3> 
+    CONSTRUCTOR visibility:public <> (x:kotlin.collections.List<T of <uninitialized parent>>) returnType:<root>.Test3<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<T of <uninitialized parent>> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test3 modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3.<init>' type=kotlin.collections.List<T of <root>.Test3> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: kotlin.collections.List<T of <uninitialized parent>> declared in <root>.Test3.<init>' type=kotlin.collections.List<T of <uninitialized parent>> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.collections.List<T of <root>.Test3> 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
@@ -82,6 +92,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<T of <root>.Test3> visibility:public [final] ' type=kotlin.collections.List<T of <root>.Test3> origin=null
               receiver: GET_VAR '<this>: <root>.Test3 declared in <root>.Test3.<get-x>' type=<root>.Test3 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test3) returnType:kotlin.collections.List<T of <root>.Test3> 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test3 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3'
+          CALL 'public final fun <get-x> (): kotlin.collections.List<T of <root>.Test3> declared in <root>.Test3' type=kotlin.collections.List<T of <root>.Test3> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -113,6 +128,11 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.collections.List<kotlin.String> declared in <root>.Test4'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.collections.List<kotlin.String> visibility:public [final] ' type=kotlin.collections.List<kotlin.String> origin=null
               receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.<get-x>' type=<root>.Test4 origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test4) returnType:kotlin.collections.List<kotlin.String> 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test4 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.collections.List<kotlin.String> declared in <root>.Test4'
+          CALL 'public final fun <get-x> (): kotlin.collections.List<kotlin.String> declared in <root>.Test4' type=kotlin.collections.List<kotlin.String> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -126,3 +146,4 @@ FILE fqName:<root> fileName:/dataClassesGeneric.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt
index 74fcbf0c72d..bc3d2564ee4 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementation.fir.txt
@@ -1,169 +1,170 @@
 FILE fqName:<root> fileName:/delegatedImplementation.kt
   CLASS INTERFACE name:IBase modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IBase
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IBase, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IBase
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:s index:1 type:kotlin.String
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.IBase) returnType:kotlin.Int
-      $this: VALUE_PARAMETER name:<this> type:<root>.IBase
-    FUN name:qux visibility:public modality:ABSTRACT <> ($this:<root>.IBase) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IBase
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IBase 
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IBase, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IBase 
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int 
+      VALUE_PARAMETER name:s index:1 type:kotlin.String 
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.IBase) returnType:kotlin.Int 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IBase 
+    FUN name:qux visibility:public modality:ABSTRACT <> ($this:<root>.IBase) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IBase 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS OBJECT name:BaseImpl modality:FINAL visibility:public superTypes:[<root>.IBase]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.BaseImpl
-    CONSTRUCTOR visibility:private <> () returnType:<root>.BaseImpl [primary]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.BaseImpl 
+    CONSTRUCTOR visibility:private <> () returnType:<root>.BaseImpl [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:BaseImpl modality:FINAL visibility:public superTypes:[<root>.IBase]'
-    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.BaseImpl, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.BaseImpl
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-      VALUE_PARAMETER name:s index:1 type:kotlin.String
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.BaseImpl, x:kotlin.Int, s:kotlin.String) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.BaseImpl 
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int 
+      VALUE_PARAMETER name:s index:1 type:kotlin.String 
       BLOCK_BODY
-    FUN name:bar visibility:public modality:FINAL <> ($this:<root>.BaseImpl) returnType:kotlin.Int
-      $this: VALUE_PARAMETER name:<this> type:<root>.BaseImpl
+    FUN name:bar visibility:public modality:FINAL <> ($this:<root>.BaseImpl) returnType:kotlin.Int 
+      $this: VALUE_PARAMETER name:<this> type:<root>.BaseImpl 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun bar (): kotlin.Int declared in <root>.BaseImpl'
           CONST Int type=kotlin.Int value=42
-    FUN name:qux visibility:public modality:FINAL <> ($this:<root>.BaseImpl) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.BaseImpl
+    FUN name:qux visibility:public modality:FINAL <> ($this:<root>.BaseImpl) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.BaseImpl 
       BLOCK_BODY
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:IOther modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IOther
-    PROPERTY name:x visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.String
-        correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IOther
-    PROPERTY name:y visibility:public modality:ABSTRACT [var]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:y visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IOther
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:ABSTRACT <> ($this:<root>.IOther, <set-?>:kotlin.Int) returnType:kotlin.Unit
-        correspondingProperty: PROPERTY name:y visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IOther
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
-    PROPERTY name:z1 visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z1> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:z1 visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IOther
-    PROPERTY name:z2 visibility:public modality:ABSTRACT [var]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z2> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:z2 visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IOther
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z2> visibility:public modality:ABSTRACT <> ($this:<root>.IOther, <set-?>:kotlin.Int) returnType:kotlin.Unit
-        correspondingProperty: PROPERTY name:z2 visibility:public modality:ABSTRACT [var]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IOther
-        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IOther 
+    PROPERTY name:x visibility:public modality:ABSTRACT [val] 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.String 
+        correspondingProperty: PROPERTY name:x visibility:public modality:ABSTRACT [val] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IOther 
+    PROPERTY name:y visibility:public modality:ABSTRACT [var] 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.Int 
+        correspondingProperty: PROPERTY name:y visibility:public modality:ABSTRACT [var] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IOther 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:ABSTRACT <> ($this:<root>.IOther, <set-?>:kotlin.Int) returnType:kotlin.Unit 
+        correspondingProperty: PROPERTY name:y visibility:public modality:ABSTRACT [var] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IOther 
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
+    PROPERTY name:z1 visibility:public modality:ABSTRACT [val] 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z1> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.Int 
+        correspondingProperty: PROPERTY name:z1 visibility:public modality:ABSTRACT [val] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IOther 
+    PROPERTY name:z2 visibility:public modality:ABSTRACT [var] 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z2> visibility:public modality:ABSTRACT <> ($this:<root>.IOther) returnType:kotlin.Int 
+        correspondingProperty: PROPERTY name:z2 visibility:public modality:ABSTRACT [var] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IOther 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<set-z2> visibility:public modality:ABSTRACT <> ($this:<root>.IOther, <set-?>:kotlin.Int) returnType:kotlin.Unit 
+        correspondingProperty: PROPERTY name:z2 visibility:public modality:ABSTRACT [var] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IOther 
+        VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-  FUN name:otherImpl visibility:public modality:FINAL <> (x0:kotlin.String, y0:kotlin.Int) returnType:<root>.IOther
-    VALUE_PARAMETER name:x0 index:0 type:kotlin.String
-    VALUE_PARAMETER name:y0 index:1 type:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+  FUN name:otherImpl visibility:public modality:FINAL <> (x0:kotlin.String, y0:kotlin.Int) returnType:<root>.IOther 
+    VALUE_PARAMETER name:x0 index:0 type:kotlin.String 
+    VALUE_PARAMETER name:y0 index:1 type:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun otherImpl (x0: kotlin.String, y0: kotlin.Int): <root>.IOther declared in <root>'
         BLOCK type=<root>.otherImpl.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IOther]
-            $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.otherImpl.<no name provided>
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary]
+            $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.otherImpl.<no name provided> 
+            CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IOther]'
-            PROPERTY name:x visibility:public modality:FINAL [val]
-              FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final]
+            PROPERTY name:x visibility:public modality:FINAL [val] 
+              FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] 
                 EXPRESSION_BODY
                   GET_VAR 'x0: kotlin.String declared in <root>.otherImpl' type=kotlin.String origin=null
-              FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.String
-                correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val]
-                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided>
+              FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.String 
+                correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
+                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided> 
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.String declared in <root>.otherImpl.<no name provided>'
                     GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.String visibility:public [final] ' type=kotlin.String origin=null
                       receiver: GET_VAR '<this>: <root>.otherImpl.<no name provided> declared in <root>.otherImpl.<no name provided>.<get-x>' type=<root>.otherImpl.<no name provided> origin=null
-            PROPERTY name:y visibility:public modality:FINAL [var]
-              FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public
+            PROPERTY name:y visibility:public modality:FINAL [var] 
+              FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public 
                 EXPRESSION_BODY
                   GET_VAR 'y0: kotlin.Int declared in <root>.otherImpl' type=kotlin.Int origin=null
-              FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.Int
-                correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var]
-                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided>
+              FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.Int 
+                correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] 
+                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided> 
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.otherImpl.<no name provided>'
                     GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
                       receiver: GET_VAR '<this>: <root>.otherImpl.<no name provided> declared in <root>.otherImpl.<no name provided>.<get-y>' type=<root>.otherImpl.<no name provided> origin=null
-              FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>, <set-?>:kotlin.Int) returnType:kotlin.Unit
-                correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var]
-                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided>
-                VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int
+              FUN DEFAULT_PROPERTY_ACCESSOR name:<set-y> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>, <set-?>:kotlin.Int) returnType:kotlin.Unit 
+                correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [var] 
+                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided> 
+                VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
                 BLOCK_BODY
                   SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public ' type=kotlin.Unit origin=null
                     receiver: GET_VAR '<this>: <root>.otherImpl.<no name provided> declared in <root>.otherImpl.<no name provided>.<set-y>' type=<root>.otherImpl.<no name provided> origin=null
                     value: GET_VAR '<set-?>: kotlin.Int declared in <root>.otherImpl.<no name provided>.<set-y>' type=kotlin.Int origin=null
-            PROPERTY name:z1 visibility:public modality:FINAL [val]
-              FUN name:<get-z1> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.Int
-                correspondingProperty: PROPERTY name:z1 visibility:public modality:FINAL [val]
-                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided>
+            PROPERTY name:z1 visibility:public modality:FINAL [val] 
+              FUN name:<get-z1> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.Int 
+                correspondingProperty: PROPERTY name:z1 visibility:public modality:FINAL [val] 
+                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided> 
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='public final fun <get-z1> (): kotlin.Int declared in <root>.otherImpl.<no name provided>'
                     CONST Int type=kotlin.Int value=1
-            PROPERTY name:z2 visibility:public modality:FINAL [var]
-              FUN name:<get-z2> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.Int
-                correspondingProperty: PROPERTY name:z2 visibility:public modality:FINAL [var]
-                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided>
+            PROPERTY name:z2 visibility:public modality:FINAL [var] 
+              FUN name:<get-z2> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>) returnType:kotlin.Int 
+                correspondingProperty: PROPERTY name:z2 visibility:public modality:FINAL [var] 
+                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided> 
                 BLOCK_BODY
                   RETURN type=kotlin.Nothing from='public final fun <get-z2> (): kotlin.Int declared in <root>.otherImpl.<no name provided>'
                     CONST Int type=kotlin.Int value=2
-              FUN name:<set-z2> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>, value:kotlin.Int) returnType:kotlin.Unit
-                correspondingProperty: PROPERTY name:z2 visibility:public modality:FINAL [var]
-                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided>
-                VALUE_PARAMETER name:value index:0 type:kotlin.Int
+              FUN name:<set-z2> visibility:public modality:FINAL <> ($this:<root>.otherImpl.<no name provided>, value:kotlin.Int) returnType:kotlin.Unit 
+                correspondingProperty: PROPERTY name:z2 visibility:public modality:FINAL [var] 
+                $this: VALUE_PARAMETER name:<this> type:<root>.otherImpl.<no name provided> 
+                VALUE_PARAMETER name:value index:0 type:kotlin.Int 
                 BLOCK_BODY
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.otherImpl.<no name provided>' type=<root>.otherImpl.<no name provided> origin=null
   CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Test1 [primary]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Test1 [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[]'
   CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Test2 [primary]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Test2 [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test2 modality:FINAL visibility:public superTypes:[]'
+
diff --git a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt
index 863ba4cf395..bd1406470fb 100644
--- a/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatedImplementationWithExplicitOverride.fir.txt
@@ -1,54 +1,55 @@
 FILE fqName:<root> fileName:/delegatedImplementationWithExplicitOverride.kt
   CLASS INTERFACE name:IFooBar modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFooBar
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IFooBar) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IFooBar
-    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.IFooBar) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IFooBar
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IFooBar 
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IFooBar) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IFooBar 
+    FUN name:bar visibility:public modality:ABSTRACT <> ($this:<root>.IFooBar) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IFooBar 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS OBJECT name:FooBarImpl modality:FINAL visibility:public superTypes:[<root>.IFooBar]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FooBarImpl
-    CONSTRUCTOR visibility:private <> () returnType:<root>.FooBarImpl [primary]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.FooBarImpl 
+    CONSTRUCTOR visibility:private <> () returnType:<root>.FooBarImpl [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:FooBarImpl modality:FINAL visibility:public superTypes:[<root>.IFooBar]'
-    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.FooBarImpl) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.FooBarImpl
+    FUN name:foo visibility:public modality:FINAL <> ($this:<root>.FooBarImpl) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.FooBarImpl 
       BLOCK_BODY
-    FUN name:bar visibility:public modality:FINAL <> ($this:<root>.FooBarImpl) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.FooBarImpl
+    FUN name:bar visibility:public modality:FINAL <> ($this:<root>.FooBarImpl) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.FooBarImpl 
       BLOCK_BODY
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS CLASS name:C modality:FINAL visibility:public superTypes:[]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C
-    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary]
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.C [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C modality:FINAL visibility:public superTypes:[]'
-    FUN name:bar visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.C
+    FUN name:bar visibility:public modality:FINAL <> ($this:<root>.C) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.C 
       BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.fir.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.fir.txt
index 9399d7046d0..ee62aea17da 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallToTypeAliasConstructor.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
   CLASS CLASS name:Cell modality:OPEN visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Cell 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (value:T of <root>.Cell) returnType:<root>.Cell<T of <root>.Cell> [primary] 
-      VALUE_PARAMETER name:value index:0 type:T of <root>.Cell 
+    CONSTRUCTOR visibility:public <> (value:T of <uninitialized parent>) returnType:<root>.Cell<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:value index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Cell modality:OPEN visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:value visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Cell visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'value: T of <root>.Cell declared in <root>.Cell.<init>' type=T of <root>.Cell origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'value: T of <uninitialized parent> declared in <root>.Cell.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Cell) returnType:T of <root>.Cell 
         correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Cell 
@@ -35,7 +35,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C1 
     CONSTRUCTOR visibility:public <> () returnType:<root>.C1 [primary] 
       BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Cell) [primary] declared in <root>.Cell'
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (value: T of <uninitialized parent>) [primary] declared in <root>.Cell'
           value: CONST String type=kotlin.String value="O"
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C1 modality:FINAL visibility:public superTypes:[<root>.Cell<kotlin.String>]'
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
@@ -55,7 +55,7 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.C2 
     CONSTRUCTOR visibility:public <> () returnType:<root>.C2 [primary] 
       BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Cell) [primary] declared in <root>.Cell'
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (value: T of <uninitialized parent>) [primary] declared in <root>.Cell'
           value: CONST String type=kotlin.String value="K"
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:C2 modality:FINAL visibility:public superTypes:[<root>.Cell]'
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
@@ -71,3 +71,4 @@ FILE fqName:<root> fileName:/delegatingConstructorCallToTypeAliasConstructor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.fir.txt b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.fir.txt
index b14c7428f87..cf4f1e67e91 100644
--- a/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.fir.txt
+++ b/compiler/testData/ir/irText/classes/delegatingConstructorCallsInSecondaryConstructors.fir.txt
@@ -46,3 +46,4 @@ FILE fqName:<root> fileName:/delegatingConstructorCallsInSecondaryConstructors.k
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/enum.fir.txt b/compiler/testData/ir/irText/classes/enum.fir.txt
index d79458fc1e7..c66d53da8d7 100644
--- a/compiler/testData/ir/irText/classes/enum.fir.txt
+++ b/compiler/testData/ir/irText/classes/enum.fir.txt
@@ -207,8 +207,8 @@ FILE fqName:<root> fileName:/enum.kt
       FUN name:foo visibility:public modality:FINAL <> ($this:<root>.TestEnum3.TEST) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.TestEnum3.TEST 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            CONST String type=kotlin.String value="Hello, world!"
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="Hello, world!"
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -274,8 +274,8 @@ FILE fqName:<root> fileName:/enum.kt
       FUN name:foo visibility:public modality:FINAL <> ($this:<root>.TestEnum4.TEST1) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.TestEnum4.TEST1 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            ERROR_CALL 'Unresolved reference: <Unresolved name: TEST1>#' type=IrErrorType
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: ERROR_CALL 'Unresolved reference: R|/TestEnum4.TEST1|' type=<root>.TestEnum4
       FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any 
         overridden:
           protected final fun clone (): kotlin.Any declared in kotlin.Enum
@@ -321,8 +321,8 @@ FILE fqName:<root> fileName:/enum.kt
       FUN name:foo visibility:public modality:FINAL <> ($this:<root>.TestEnum4.TEST2) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.TestEnum4.TEST2 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            ERROR_CALL 'Unresolved reference: <Unresolved name: TEST2>#' type=IrErrorType
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: ERROR_CALL 'Unresolved reference: R|/TestEnum4.TEST2|' type=<root>.TestEnum4
       FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any 
         overridden:
           protected final fun clone (): kotlin.Any declared in kotlin.Enum
@@ -487,3 +487,4 @@ FILE fqName:<root> fileName:/enum.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/classes/enumClassModality.fir.txt b/compiler/testData/ir/irText/classes/enumClassModality.fir.txt
index 1b7065bda37..39fc38a9f0d 100644
--- a/compiler/testData/ir/irText/classes/enumClassModality.fir.txt
+++ b/compiler/testData/ir/irText/classes/enumClassModality.fir.txt
@@ -380,3 +380,4 @@ FILE fqName:<root> fileName:/enumClassModality.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt
index 94ee152e1f5..474dcd85e89 100644
--- a/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt
+++ b/compiler/testData/ir/irText/classes/enumWithSecondaryCtor.fir.txt
@@ -181,8 +181,8 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
       FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Test2.ZERO) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test2.ZERO 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            CONST String type=kotlin.String value="ZERO"
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="ZERO"
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -206,8 +206,8 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
       FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Test2.ONE) returnType:kotlin.Unit 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test2.ONE 
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            CONST String type=kotlin.String value="ONE"
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="ONE"
       FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any 
         overridden:
           protected final fun clone (): kotlin.Any declared in kotlin.Enum
@@ -258,3 +258,4 @@ FILE fqName:<root> fileName:/enumWithSecondaryCtor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/classes/initBlock.fir.txt b/compiler/testData/ir/irText/classes/initBlock.fir.txt
index 6ef7f22b158..afe114d6462 100644
--- a/compiler/testData/ir/irText/classes/initBlock.fir.txt
+++ b/compiler/testData/ir/irText/classes/initBlock.fir.txt
@@ -81,16 +81,16 @@ FILE fqName:<root> fileName:/initBlock.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test4 
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-          CONST String type=kotlin.String value="1"
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="1"
     CONSTRUCTOR visibility:public <> () returnType:<root>.Test4 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-          CONST String type=kotlin.String value="2"
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="2"
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -112,8 +112,8 @@ FILE fqName:<root> fileName:/initBlock.kt
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test5 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-          CONST String type=kotlin.String value="1"
+        CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+          message: CONST String type=kotlin.String value="1"
     CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test5.TestInner 
       CONSTRUCTOR visibility:public <> () returnType:<root>.Test5.TestInner [primary] 
@@ -122,8 +122,8 @@ FILE fqName:<root> fileName:/initBlock.kt
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
       ANONYMOUS_INITIALIZER isStatic=false
         BLOCK_BODY
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            CONST String type=kotlin.String value="2"
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: CONST String type=kotlin.String value="2"
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -150,3 +150,4 @@ FILE fqName:<root> fileName:/initBlock.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/initVal.fir.txt b/compiler/testData/ir/irText/classes/initVal.fir.txt
index 4836be3dea7..3c44db275ff 100644
--- a/compiler/testData/ir/irText/classes/initVal.fir.txt
+++ b/compiler/testData/ir/irText/classes/initVal.fir.txt
@@ -92,3 +92,4 @@ FILE fqName:<root> fileName:/initVal.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/initVar.fir.txt b/compiler/testData/ir/irText/classes/initVar.fir.txt
index 50485d7737b..2afa3517c61 100644
--- a/compiler/testData/ir/irText/classes/initVar.fir.txt
+++ b/compiler/testData/ir/irText/classes/initVar.fir.txt
@@ -226,3 +226,4 @@ FILE fqName:<root> fileName:/initVar.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/inlineClass.fir.txt b/compiler/testData/ir/irText/classes/inlineClass.fir.txt
index b91553f8e32..6999d44b8bb 100644
--- a/compiler/testData/ir/irText/classes/inlineClass.fir.txt
+++ b/compiler/testData/ir/irText/classes/inlineClass.fir.txt
@@ -30,3 +30,4 @@ FILE fqName:<root> fileName:/inlineClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/innerClass.fir.txt b/compiler/testData/ir/irText/classes/innerClass.fir.txt
index 736ae95add3..efad1950227 100644
--- a/compiler/testData/ir/irText/classes/innerClass.fir.txt
+++ b/compiler/testData/ir/irText/classes/innerClass.fir.txt
@@ -56,3 +56,4 @@ FILE fqName:<root> fileName:/innerClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.fir.txt b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.fir.txt
index 87de7395242..1b53e95b989 100644
--- a/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.fir.txt
+++ b/compiler/testData/ir/irText/classes/innerClassWithDelegatingConstructor.fir.txt
@@ -53,3 +53,4 @@ FILE fqName:<root> fileName:/innerClassWithDelegatingConstructor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt
index 1ed4d790080..1a5b295b708 100644
--- a/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt
+++ b/compiler/testData/ir/irText/classes/lambdaInDataClassDefaultParameter.fir.txt
@@ -1,29 +1,33 @@
 FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
   CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A 
-    CONSTRUCTOR visibility:public <> (runA:kotlin.Function2) returnType:<root>.A [primary] 
-      VALUE_PARAMETER name:runA index:0 type:kotlin.Function2 
+    CONSTRUCTOR visibility:public <> (runA:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit>) returnType:<root>.A [primary] 
+      VALUE_PARAMETER name:runA index:0 type:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
         EXPRESSION_BODY
-          BLOCK type=kotlin.Function2 origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function2 
+          BLOCK type=kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Function2 declared in <root>.A.<init>'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function2 declared in <root>.A.<init>' type=kotlin.Function2 origin=LAMBDA
+                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=LAMBDA
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public [data] superTypes:[kotlin.Any]'
     PROPERTY name:runA visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:runA type:kotlin.Function2 visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:runA type:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'runA: kotlin.Function2 declared in <root>.A.<init>' type=kotlin.Function2 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Function2 
+          GET_VAR 'runA: kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A.<init>' type=kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-runA> visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
         correspondingProperty: PROPERTY name:runA visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): kotlin.Function2 declared in <root>.A'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:kotlin.Function2 visibility:public [final] ' type=kotlin.Function2 origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-runA> (): kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:runA type:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> visibility:public [final] ' type=kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
               receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-runA>' type=<root>.A origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> 
+      $this: VALUE_PARAMETER name:<this> type:<root>.A 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A'
+          CALL 'public final fun <get-runA> (): kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> declared in <root>.A' type=kotlin.Function2<<root>.A, kotlin.String, kotlin.Unit> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -45,7 +49,7 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
           BLOCK type=<root>.B.<init>.<no name provided> origin=OBJECT_LITERAL
             CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B.<init>.<no name provided> 
-              CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+              CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
@@ -64,6 +68,11 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Any declared in <root>.B'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Any visibility:public [final] ' type=kotlin.Any origin=null
               receiver: GET_VAR '<this>: <root>.B declared in <root>.B.<get-x>' type=<root>.B origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.B) returnType:kotlin.Any 
+      $this: VALUE_PARAMETER name:<this> type:<root>.B 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Any declared in <root>.B'
+          CALL 'public final fun <get-x> (): kotlin.Any declared in <root>.B' type=kotlin.Any origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -77,3 +86,4 @@ FILE fqName:<root> fileName:/lambdaInDataClassDefaultParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/localClasses.fir.txt b/compiler/testData/ir/irText/classes/localClasses.fir.txt
index 901bdca233e..7528b966614 100644
--- a/compiler/testData/ir/irText/classes/localClasses.fir.txt
+++ b/compiler/testData/ir/irText/classes/localClasses.fir.txt
@@ -10,17 +10,5 @@ FILE fqName:<root> fileName:/localClasses.kt
         FUN name:foo visibility:public modality:FINAL <> ($this:<root>.outer.LocalClass) returnType:kotlin.Unit 
           $this: VALUE_PARAMETER name:<this> type:<root>.outer.LocalClass 
           BLOCK_BODY
-        FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
-          overridden:
-            public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-          VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
-        FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
-          overridden:
-            public open fun hashCode (): kotlin.Int declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-        FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
-          overridden:
-            public open fun toString (): kotlin.String declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-      CALL 'public final fun foo (): kotlin.Unit declared in <root>.outer.LocalClass' type=kotlin.Unit origin=null
+      ERROR_CALL 'Unresolved reference: <Unresolved name: foo>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt b/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt
index f38e93c8d4a..e8b5672cad2 100644
--- a/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt
+++ b/compiler/testData/ir/irText/classes/objectLiteralExpressions.fir.txt
@@ -17,42 +17,42 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Any visibility:public [final,static] 
       EXPRESSION_BODY
         BLOCK type=<root>.test1.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test1.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test1.<no name provided>' type=<root>.test1.<no name provided> origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:IrErrorType 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Any 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Any declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Any visibility:public [final,static] ' type=kotlin.Any origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:<root>.IFoo visibility:public [final,static] 
       EXPRESSION_BODY
         BLOCK type=<root>.test2.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IFoo]
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test2.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.IFoo]'
             FUN name:foo visibility:public modality:FINAL <> ($this:<root>.test2.<no name provided>) returnType:kotlin.Unit 
               $this: VALUE_PARAMETER name:<this> type:<root>.test2.<no name provided> 
               BLOCK_BODY
-                ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-                  CONST String type=kotlin.String value="foo"
+                CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+                  message: CONST String type=kotlin.String value="foo"
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test2.<no name provided>' type=<root>.test2.<no name provided> origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:IrErrorType 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:<root>.IFoo 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): <root>.IFoo declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:<root>.IFoo visibility:public [final,static] ' type=<root>.IFoo origin=null
   CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer 
     CONSTRUCTOR visibility:public <> () returnType:<root>.Outer [primary] 
@@ -82,22 +82,22 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN name:test3 visibility:public modality:FINAL <> ($this:<root>.Outer) returnType:IrErrorType 
+    FUN name:test3 visibility:public modality:FINAL <> ($this:<root>.Outer) returnType:<root>.Outer.Inner 
       $this: VALUE_PARAMETER name:<this> type:<root>.Outer 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun test3 (): IrErrorType declared in <root>.Outer'
+        RETURN type=kotlin.Nothing from='public final fun test3 (): <root>.Outer.Inner declared in <root>.Outer'
           BLOCK type=<root>.Outer.test3.<no name provided> origin=OBJECT_LITERAL
             CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner]
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.test3.<no name provided> 
-              CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+              CONSTRUCTOR visibility:private <> () returnType:<root>.Outer.Inner [primary] 
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Outer.Inner'
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner]'
               FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Outer.test3.<no name provided>) returnType:kotlin.Unit 
                 $this: VALUE_PARAMETER name:<this> type:<root>.Outer.test3.<no name provided> 
                 BLOCK_BODY
-                  ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-                    CONST String type=kotlin.String value="foo"
+                  CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+                    message: CONST String type=kotlin.String value="foo"
             CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.Outer.test3.<no name provided>' type=<root>.Outer.test3.<no name provided> origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -112,19 +112,19 @@ FILE fqName:<root> fileName:/objectLiteralExpressions.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:test4 visibility:public modality:FINAL <> () returnType:IrErrorType 
+  FUN name:test4 visibility:public modality:FINAL <> () returnType:<root>.Outer.Inner 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4 (): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test4 (): <root>.Outer.Inner declared in <root>'
         BLOCK type=<root>.test4.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner]
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test4.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:<root>.Outer.Inner [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.Outer.Inner'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner]'
             FUN name:foo visibility:public modality:FINAL <> ($this:<root>.test4.<no name provided>) returnType:kotlin.Unit 
               $this: VALUE_PARAMETER name:<this> type:<root>.test4.<no name provided> 
               BLOCK_BODY
-                ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-                  CONST String type=kotlin.String value="foo"
+                CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+                  message: CONST String type=kotlin.String value="foo"
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test4.<no name provided>' type=<root>.test4.<no name provided> origin=null
diff --git a/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt b/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt
index 47eaf0d6fc1..7f7dd83ae4c 100644
--- a/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt
+++ b/compiler/testData/ir/irText/classes/objectWithInitializers.fir.txt
@@ -61,3 +61,4 @@ FILE fqName:<root> fileName:/objectWithInitializers.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt b/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt
index 08cb8a89bad..6882ac64dd5 100644
--- a/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt
+++ b/compiler/testData/ir/irText/classes/outerClassAccess.fir.txt
@@ -32,7 +32,7 @@ FILE fqName:<root> fileName:/outerClassAccess.kt
         FUN name:test3 visibility:public modality:FINAL <> ($this:<root>.Outer.Inner.Inner2) returnType:kotlin.Unit 
           $this: VALUE_PARAMETER name:<this> type:<root>.Outer.Inner.Inner2 
           BLOCK_BODY
-            CALL 'public final fun foo (): kotlin.Unit declared in <root>.Outer' type=kotlin.Unit origin=null
+            ERROR_CALL 'Unresolved reference: <Ambiguity: foo, [/Outer.foo, /Outer.foo]>#' type=IrErrorType
         FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
           overridden:
             public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -72,3 +72,4 @@ FILE fqName:<root> fileName:/outerClassAccess.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt b/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt
index 74d3c6d7b12..d58d88c289b 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructor.fir.txt
@@ -62,15 +62,15 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-y>' type=<root>.Test2 origin=null
     PROPERTY name:x visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:x type:IrErrorType visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] 
         EXPRESSION_BODY
-          ERROR_CALL 'No getter found for R|/Test2.x|' type=IrErrorType
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:IrErrorType 
+          GET_VAR 'x: kotlin.Int declared in <root>.Test2.<init>' type=kotlin.Int origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test2) returnType:kotlin.Int 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test2 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-x> (): IrErrorType declared in <root>.Test2'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test2'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Test2 declared in <root>.Test2.<get-x>' type=<root>.Test2 origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -116,7 +116,7 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
-          value: CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.Test3' type=kotlin.Int origin=null
+          value: GET_VAR 'x: kotlin.Int declared in <root>.Test3.<init>' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -130,3 +130,4 @@ FILE fqName:<root> fileName:/primaryConstructor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.fir.txt b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.fir.txt
index 9bf6f00738c..3edb4aebbd2 100644
--- a/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.fir.txt
+++ b/compiler/testData/ir/irText/classes/primaryConstructorWithSuperConstructorCall.fir.txt
@@ -105,3 +105,4 @@ FILE fqName:<root> fileName:/primaryConstructorWithSuperConstructorCall.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt
index c68c2926156..bbbd2a4e94b 100644
--- a/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt
+++ b/compiler/testData/ir/irText/classes/qualifiedSuperCalls.fir.txt
@@ -58,16 +58,16 @@ FILE fqName:<root> fileName:/qualifiedSuperCalls.kt
     FUN name:foo visibility:public modality:FINAL <> ($this:<root>.CBoth) returnType:kotlin.Unit 
       $this: VALUE_PARAMETER name:<this> type:<root>.CBoth 
       BLOCK_BODY
-        CALL 'public final fun foo (): kotlin.Unit declared in <root>.CBoth' type=kotlin.Unit origin=null
-        CALL 'public final fun foo (): kotlin.Unit declared in <root>.CBoth' type=kotlin.Unit origin=null
+        CALL 'public open fun foo (): kotlin.Unit declared in <root>.ILeft' type=kotlin.Unit origin=null
+        CALL 'public open fun foo (): kotlin.Unit declared in <root>.IRight' type=kotlin.Unit origin=null
     PROPERTY name:bar visibility:public modality:FINAL [val] 
       FUN name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.CBoth) returnType:kotlin.Int 
         correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.CBoth 
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-bar> (): kotlin.Int declared in <root>.CBoth'
-            ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
-              ERROR_CALL 'No getter found for R|/CBoth.bar|' type=kotlin.Int
+            CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+              other: CALL 'public open fun <get-bar> (): kotlin.Int declared in <root>.IRight' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -81,3 +81,4 @@ FILE fqName:<root> fileName:/qualifiedSuperCalls.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/sealedClasses.fir.txt b/compiler/testData/ir/irText/classes/sealedClasses.fir.txt
index 0e86e5fb0f9..bc97cd16ff7 100644
--- a/compiler/testData/ir/irText/classes/sealedClasses.fir.txt
+++ b/compiler/testData/ir/irText/classes/sealedClasses.fir.txt
@@ -111,3 +111,4 @@ FILE fqName:<root> fileName:/sealedClasses.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt
index ebe2e638d44..1d9bcba7716 100644
--- a/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt
+++ b/compiler/testData/ir/irText/classes/secondaryConstructorWithInitializersFromClassBody.fir.txt
@@ -89,3 +89,4 @@ FILE fqName:<root> fileName:/secondaryConstructorWithInitializersFromClassBody.k
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/classes/superCalls.fir.txt b/compiler/testData/ir/irText/classes/superCalls.fir.txt
index 1afcf48e6e6..bfbc2afb21b 100644
--- a/compiler/testData/ir/irText/classes/superCalls.fir.txt
+++ b/compiler/testData/ir/irText/classes/superCalls.fir.txt
@@ -41,14 +41,14 @@ FILE fqName:<root> fileName:/superCalls.kt
     FUN name:foo visibility:public modality:FINAL <> ($this:<root>.Derived) returnType:kotlin.Unit 
       $this: VALUE_PARAMETER name:<this> type:<root>.Derived 
       BLOCK_BODY
-        CALL 'public final fun foo (): kotlin.Unit declared in <root>.Derived' type=kotlin.Unit origin=null
+        CALL 'public open fun foo (): kotlin.Unit declared in <root>.Base' type=kotlin.Unit origin=null
     PROPERTY name:bar visibility:public modality:FINAL [val] 
       FUN name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Derived) returnType:kotlin.String 
         correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Derived 
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-bar> (): kotlin.String declared in <root>.Derived'
-            ERROR_CALL 'No getter found for R|/Derived.bar|' type=kotlin.String
+            CALL 'public open fun <get-bar> (): kotlin.String declared in <root>.Base' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -62,3 +62,4 @@ FILE fqName:<root> fileName:/superCalls.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.fir.txt
index e1bfc02ca21..943ef7773a9 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsInAnnotationArguments.fir.txt
@@ -85,3 +85,4 @@ FILE fqName:<root> fileName:/annotationsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt
index fbd8624ebcd..0ef183360b9 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithDefaultParameterValues.fir.txt
@@ -53,3 +53,4 @@ FILE fqName:<root> fileName:/annotationsWithDefaultParameterValues.kt
     BLOCK_BODY
   FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt
index 5c377b60f3c..41c07524b16 100644
--- a/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/annotationsWithVarargParameters.fir.txt
@@ -1,12 +1,12 @@
 FILE fqName:<root> fileName:/annotationsWithVarargParameters.kt
   CLASS ANNOTATION_CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A 
-    CONSTRUCTOR visibility:public <> (xs:kotlin.String) returnType:<root>.A [primary] 
-      VALUE_PARAMETER name:xs index:0 type:kotlin.String 
+    CONSTRUCTOR visibility:public <> (xs:kotlin.Array<kotlin.String>) returnType:<root>.A [primary] 
+      VALUE_PARAMETER name:xs index:0 type:kotlin.Array<kotlin.String> 
     PROPERTY name:xs visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.String visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'xs: kotlin.String declared in <root>.A.<init>' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'xs: kotlin.Array<kotlin.String> declared in <root>.A.<init>' type=kotlin.Array<kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.String 
         correspondingProperty: PROPERTY name:xs visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A 
@@ -33,3 +33,4 @@ FILE fqName:<root> fileName:/annotationsWithVarargParameters.kt
     BLOCK_BODY
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.fir.txt
index 7d291084957..87d16f5f14a 100644
--- a/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/arrayInAnnotationArguments.fir.txt
@@ -59,3 +59,4 @@ FILE fqName:<root> fileName:/arrayInAnnotationArguments.kt
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt
index a8f181b11ba..69f81a9bf19 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classLiteralInAnnotation.fir.txt
@@ -48,16 +48,16 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-  FUN name:test2 visibility:public modality:FINAL <T> () returnType:IrErrorType [inline] 
+  FUN name:test2 visibility:public modality:FINAL <T> () returnType:kotlin.Any [inline] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 <T> (): IrErrorType [inline] declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test2 <T> (): kotlin.Any [inline] declared in <root>'
         BLOCK type=<root>.test2.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
             annotations:
               A(klass = <null>)
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test2.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
@@ -72,7 +72,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
               annotations:
                 A(klass = <null>)
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.<get-test3>.<no name provided> 
-              CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+              CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
@@ -86,7 +86,7 @@ FILE fqName:<root> fileName:/classLiteralInAnnotation.kt
             annotations:
               A(klass = <null>)
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.<set-test3>.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
diff --git a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.txt
index b0f4b5c8503..34e2298ca4b 100644
--- a/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/classesWithAnnotations.fir.txt
@@ -174,3 +174,4 @@ FILE fqName:<root> fileName:/classesWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt
index 3d898ebe90d..fe04271c635 100644
--- a/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/constExpressionsInAnnotationArguments.fir.txt
@@ -40,3 +40,4 @@ FILE fqName:<root> fileName:/constExpressionsInAnnotationArguments.kt
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt
index 2427706387d..ba2a70d8aac 100644
--- a/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/constructorsWithAnnotations.fir.txt
@@ -50,3 +50,4 @@ FILE fqName:<root> fileName:/constructorsWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.fir.txt
index cdf1b76d348..3361f42f53f 100644
--- a/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/delegateFieldWithAnnotations.fir.txt
@@ -24,3 +24,4 @@ FILE fqName:<root> fileName:/delegateFieldWithAnnotations.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test1> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt
index acf93c85608..1385883918c 100644
--- a/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/delegatedPropertyAccessorsWithAnnotations.fir.txt
@@ -107,3 +107,4 @@ FILE fqName:<root> fileName:/delegatedPropertyAccessorsWithAnnotations.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [static] ' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: IrErrorType declared in <root>.<set-test2>' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt
index 236ca2cd75e..d0955735a12 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumEntriesWithAnnotations.fir.txt
@@ -108,3 +108,4 @@ FILE fqName:<root> fileName:/enumEntriesWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt
index 13f9554b751..03b2b2fab77 100644
--- a/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/enumsInAnnotationArguments.fir.txt
@@ -133,3 +133,4 @@ FILE fqName:<root> fileName:/enumsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.fir.txt
index 7dd6487166a..d9fd6d73a0c 100644
--- a/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/fieldsWithAnnotations.fir.txt
@@ -55,3 +55,4 @@ FILE fqName:<root> fileName:/fieldsWithAnnotations.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVar type:kotlin.String visibility:public [static] ' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: kotlin.String declared in <root>.<set-testVar>' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.fir.txt
index 0a52aacdc1d..bd9fc0aebd7 100644
--- a/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/fileAnnotations.fir.txt
@@ -29,3 +29,4 @@ FILE fqName:test fileName:/fileAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt
index 7f479a55922..94325171149 100644
--- a/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/functionsWithAnnotations.fir.txt
@@ -29,3 +29,4 @@ FILE fqName:<root> fileName:/functionsWithAnnotations.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:testSimpleFunction visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.fir.txt b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.fir.txt
index 516b4af3962..b9f77ee7fb8 100644
--- a/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/javaAnnotation.fir.txt
@@ -5,3 +5,4 @@ FILE fqName:<root> fileName:/javaAnnotation.kt
     BLOCK_BODY
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.fir.txt
index a91eaa3cb47..21236aaa770 100644
--- a/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/localDelegatedPropertiesWithAnnotations.fir.txt
@@ -31,3 +31,4 @@ FILE fqName:<root> fileName:/localDelegatedPropertiesWithAnnotations.kt
     VALUE_PARAMETER name:m index:0 type:kotlin.collections.Map<kotlin.String, kotlin.Int> 
     BLOCK_BODY
       VAR name:test type:IrErrorType [val] 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt b/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt
index 467a7116500..4f94333c90c 100644
--- a/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/multipleAnnotationsInSquareBrackets.fir.txt
@@ -49,3 +49,4 @@ FILE fqName:<root> fileName:/multipleAnnotationsInSquareBrackets.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.fir.txt
index 1deef8e4cfb..7c96783c3d8 100644
--- a/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/primaryConstructorParameterWithAnnotations.fir.txt
@@ -48,3 +48,4 @@ FILE fqName:<root> fileName:/primaryConstructorParameterWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.fir.txt
index 5cf9a72db66..45992652145 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertiesWithAnnotations.fir.txt
@@ -38,3 +38,4 @@ FILE fqName:<root> fileName:/propertiesWithAnnotations.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-testVal> (): kotlin.String declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testVal type:kotlin.String visibility:public [final,static] ' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.fir.txt
index fdcfc7881c3..a8bfbfc4345 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsFromClassHeaderWithAnnotations.fir.txt
@@ -83,3 +83,4 @@ FILE fqName:<root> fileName:/propertyAccessorsFromClassHeaderWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt
index f01a32ff1a3..75ba885eb98 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertyAccessorsWithAnnotations.fir.txt
@@ -72,3 +72,4 @@ FILE fqName:<root> fileName:/propertyAccessorsWithAnnotations.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:kotlin.String visibility:public [static] ' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: kotlin.String declared in <root>.<set-test4>' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.fir.txt
index 45932c09c84..b2479c1d2ee 100644
--- a/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/propertySetterParameterWithAnnotations.fir.txt
@@ -73,3 +73,4 @@ FILE fqName:<root> fileName:/propertySetterParameterWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.fir.txt
index 19382f7119a..8f4f7fcdda7 100644
--- a/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/receiverParameterWithAnnotations.fir.txt
@@ -56,3 +56,4 @@ FILE fqName:<root> fileName:/receiverParameterWithAnnotations.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-topLevelP> (): kotlin.String declared in <root>'
           CONST String type=kotlin.String value=""
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.txt
index eb68560400b..d9df842f0a4 100644
--- a/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/spreadOperatorInAnnotationArguments.fir.txt
@@ -1,12 +1,12 @@
 FILE fqName:<root> fileName:/spreadOperatorInAnnotationArguments.kt
   CLASS ANNOTATION_CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A 
-    CONSTRUCTOR visibility:public <> (xs:kotlin.String) returnType:<root>.A [primary] 
-      VALUE_PARAMETER name:xs index:0 type:kotlin.String 
+    CONSTRUCTOR visibility:public <> (xs:kotlin.Array<kotlin.String>) returnType:<root>.A [primary] 
+      VALUE_PARAMETER name:xs index:0 type:kotlin.Array<kotlin.String> 
     PROPERTY name:xs visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.String visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'xs: kotlin.String declared in <root>.A.<init>' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'xs: kotlin.Array<kotlin.String> declared in <root>.A.<init>' type=kotlin.Array<kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.String 
         correspondingProperty: PROPERTY name:xs visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A 
@@ -29,3 +29,4 @@ FILE fqName:<root> fileName:/spreadOperatorInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.fir.txt
index 3f2ddbf5346..de5d62f73c6 100644
--- a/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/typeAliasesWithAnnotations.fir.txt
@@ -27,3 +27,4 @@ FILE fqName:<root> fileName:/typeAliasesWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.fir.txt
index 7eebbcab600..7bfdd71a9a3 100644
--- a/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/typeParametersWithAnnotations.fir.txt
@@ -18,3 +18,4 @@ FILE fqName:<root> fileName:/typeParametersWithAnnotations.kt
   FUN name:foo visibility:public modality:FINAL <T> () returnType:kotlin.Unit 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.fir.txt
index d2e3ad4ba12..ef83b0dd92a 100644
--- a/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/valueParametersWithAnnotations.fir.txt
@@ -38,15 +38,15 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestClassConstructor1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:xx visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:xx type:IrErrorType visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final] 
         EXPRESSION_BODY
-          ERROR_CALL 'Unresolved reference: <Unresolved name: x>#' type=IrErrorType
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:<root>.TestClassConstructor1) returnType:IrErrorType 
+          GET_VAR 'x: kotlin.Int declared in <root>.TestClassConstructor1.<init>' type=kotlin.Int origin=null
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:<root>.TestClassConstructor1) returnType:kotlin.Int 
         correspondingProperty: PROPERTY name:xx visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.TestClassConstructor1 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-xx> (): IrErrorType declared in <root>.TestClassConstructor1'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-xx> (): kotlin.Int declared in <root>.TestClassConstructor1'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.TestClassConstructor1 declared in <root>.TestClassConstructor1.<get-xx>' type=<root>.TestClassConstructor1 origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -61,3 +61,4 @@ FILE fqName:<root> fileName:/valueParametersWithAnnotations.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt
index 6ecedb8ffbe..1f60f245c7b 100644
--- a/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/varargsInAnnotationArguments.fir.txt
@@ -1,12 +1,12 @@
 FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
   CLASS ANNOTATION_CLASS name:A1 modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A1 
-    CONSTRUCTOR visibility:public <> (xs:kotlin.Int) returnType:<root>.A1 [primary] 
-      VALUE_PARAMETER name:xs index:0 type:kotlin.Int 
+    CONSTRUCTOR visibility:public <> (xs:kotlin.IntArray) returnType:<root>.A1 [primary] 
+      VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray 
     PROPERTY name:xs visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.Int visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'xs: kotlin.Int declared in <root>.A1.<init>' type=kotlin.Int origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'xs: kotlin.IntArray declared in <root>.A1.<init>' type=kotlin.IntArray origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:<root>.A1) returnType:kotlin.Int 
         correspondingProperty: PROPERTY name:xs visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A1 
@@ -29,12 +29,12 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS ANNOTATION_CLASS name:A2 modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A2 
-    CONSTRUCTOR visibility:public <> (xs:kotlin.String) returnType:<root>.A2 [primary] 
-      VALUE_PARAMETER name:xs index:0 type:kotlin.String 
+    CONSTRUCTOR visibility:public <> (xs:kotlin.Array<kotlin.String>) returnType:<root>.A2 [primary] 
+      VALUE_PARAMETER name:xs index:0 type:kotlin.Array<kotlin.String> 
     PROPERTY name:xs visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:xs type:kotlin.String visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'xs: kotlin.String declared in <root>.A2.<init>' type=kotlin.String origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'xs: kotlin.Array<kotlin.String> declared in <root>.A2.<init>' type=kotlin.Array<kotlin.String> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:<root>.A2) returnType:kotlin.String 
         correspondingProperty: PROPERTY name:xs visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A2 
@@ -57,12 +57,12 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS ANNOTATION_CLASS name:AA modality:FINAL visibility:public superTypes:[kotlin.Annotation]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.AA 
-    CONSTRUCTOR visibility:public <> (xs:<root>.A1) returnType:<root>.AA [primary] 
-      VALUE_PARAMETER name:xs index:0 type:<root>.A1 
+    CONSTRUCTOR visibility:public <> (xs:kotlin.Array<<root>.A1>) returnType:<root>.AA [primary] 
+      VALUE_PARAMETER name:xs index:0 type:kotlin.Array<<root>.A1> 
     PROPERTY name:xs visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:xs type:<root>.A1 visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'xs: <root>.A1 declared in <root>.AA.<init>' type=<root>.A1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'xs: kotlin.Array<<root>.A1> declared in <root>.AA.<init>' type=kotlin.Array<<root>.A1> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xs> visibility:public modality:FINAL <> ($this:<root>.AA) returnType:<root>.A1 
         correspondingProperty: PROPERTY name:xs visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.AA 
@@ -87,3 +87,4 @@ FILE fqName:<root> fileName:/varargsInAnnotationArguments.kt
     BLOCK_BODY
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt
index 30abdab510d..c9509373c0a 100644
--- a/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/annotations/variablesWithAnnotations.fir.txt
@@ -33,3 +33,4 @@ FILE fqName:<root> fileName:/variablesWithAnnotations.kt
         CONST String type=kotlin.String value="testVal"
       VAR name:testVar type:kotlin.String [var] 
         CONST String type=kotlin.String value="testVar"
+
diff --git a/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.fir.txt b/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.fir.txt
index ea9c068406b..b8375ce27a9 100644
--- a/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.fir.txt
+++ b/compiler/testData/ir/irText/declarations/catchParameterInTopLevelProperty.fir.txt
@@ -12,3 +12,4 @@ FILE fqName:<root> fileName:/catchParameterInTopLevelProperty.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
index d1e53d58566..2db000cefa0 100644
--- a/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/classLevelProperties.fir.txt
@@ -120,3 +120,4 @@ FILE fqName:<root> fileName:/classLevelProperties.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt b/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt
index 7c8b571ed2b..5aed5234af5 100644
--- a/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/constValInitializers.fir.txt
@@ -18,15 +18,15 @@ FILE fqName:<root> fileName:/constValInitializers.kt
         RETURN type=kotlin.Nothing from='public final fun <get-I1> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:I1 type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:I2 visibility:public modality:FINAL [const,val] 
-    FIELD PROPERTY_BACKING_FIELD name:I2 type:kotlin.String visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:I2 type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin' type=kotlin.String origin=null
+        CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           other: CALL 'public final fun <get-I1> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-I2> visibility:public modality:FINAL <> () returnType:kotlin.String 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-I2> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:I2 visibility:public modality:FINAL [const,val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-I2> (): kotlin.String declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:I2 type:kotlin.String visibility:public [final,static] ' type=kotlin.String origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-I2> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:I2 type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:STR1 visibility:public modality:FINAL [const,val] 
     FIELD PROPERTY_BACKING_FIELD name:STR1 type:kotlin.String visibility:public [final,static] 
       EXPRESSION_BODY
@@ -67,3 +67,4 @@ FILE fqName:<root> fileName:/constValInitializers.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-STR4> (): kotlin.String declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:STR4 type:kotlin.String visibility:public [final,static] ' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
index 84c9e75e296..40fa969f179 100644
--- a/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/delegatedProperties.fir.txt
@@ -76,3 +76,4 @@ FILE fqName:<root> fileName:/delegatedProperties.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [static] ' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: IrErrorType declared in <root>.<set-test4>' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/extensionProperties.fir.txt b/compiler/testData/ir/irText/declarations/extensionProperties.fir.txt
index 76c764e3ea3..e5dd04cc324 100644
--- a/compiler/testData/ir/irText/declarations/extensionProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/extensionProperties.fir.txt
@@ -53,3 +53,4 @@ FILE fqName:<root> fileName:/extensionProperties.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/fakeOverrides.fir.txt b/compiler/testData/ir/irText/declarations/fakeOverrides.fir.txt
index 95ec6b92196..a22170cde0b 100644
--- a/compiler/testData/ir/irText/declarations/fakeOverrides.fir.txt
+++ b/compiler/testData/ir/irText/declarations/fakeOverrides.fir.txt
@@ -39,7 +39,7 @@ FILE fqName:<root> fileName:/fakeOverrides.kt
   CLASS CLASS name:CFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.CFoo 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.CFoo<T of <root>.CFoo> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.CFoo<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:CFoo modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
@@ -82,16 +82,6 @@ FILE fqName:<root> fileName:/fakeOverrides.kt
         public final fun foo (x: T of <root>.CFoo): kotlin.Unit declared in <root>.CFoo
       $this: VALUE_PARAMETER name:<this> type:<root>.CFoo 
       VALUE_PARAMETER name:x index:0 type:kotlin.String 
-    FUN FAKE_OVERRIDE name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IFooStr, x:kotlin.String) returnType:kotlin.Unit 
-      overridden:
-        public abstract fun foo (x: kotlin.String): kotlin.Unit declared in <root>.IFooStr
-      $this: VALUE_PARAMETER name:<this> type:<root>.IFooStr 
-      VALUE_PARAMETER name:x index:0 type:kotlin.String 
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -101,15 +91,8 @@ FILE fqName:<root> fileName:/fakeOverrides.kt
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt b/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt
index dba9021dce3..00acde95bfa 100644
--- a/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt
+++ b/compiler/testData/ir/irText/declarations/fileWithAnnotations.fir.txt
@@ -10,3 +10,4 @@ FILE fqName:<root> fileName:/fileWithAnnotations.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-bar> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:bar type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/kt27005.fir.txt b/compiler/testData/ir/irText/declarations/kt27005.fir.txt
index 04cf61a41bf..f3441cb16e5 100644
--- a/compiler/testData/ir/irText/declarations/kt27005.fir.txt
+++ b/compiler/testData/ir/irText/declarations/kt27005.fir.txt
@@ -1,13 +1,14 @@
 FILE fqName:<root> fileName:/kt27005.kt
-  FUN name:foo visibility:public modality:FINAL <> () returnType:T of <root>.baz [suspend] 
+  FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit [suspend] 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun foo (): T of <root>.baz [suspend] declared in <root>'
-        CALL 'public final fun baz <T> (): T of <root>.baz [suspend] declared in <root>' type=T of <root>.baz origin=null
-  FUN name:bar visibility:public modality:FINAL <> () returnType:T of <root>.baz [suspend] 
+      RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Unit [suspend] declared in <root>'
+        CALL 'public final fun baz <T> (): T of <root>.baz [suspend] declared in <root>' type=kotlin.Unit origin=null
+  FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Any [suspend] 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun bar (): T of <root>.baz [suspend] declared in <root>'
-        CALL 'public final fun baz <T> (): T of <root>.baz [suspend] declared in <root>' type=T of <root>.baz origin=null
+      RETURN type=kotlin.Nothing from='public final fun bar (): kotlin.Any [suspend] declared in <root>'
+        CALL 'public final fun baz <T> (): T of <root>.baz [suspend] declared in <root>' type=kotlin.Any origin=null
   FUN name:baz visibility:public modality:FINAL <T> () returnType:T of <root>.baz [suspend] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     BLOCK_BODY
       CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/kt29833.fir.txt b/compiler/testData/ir/irText/declarations/kt29833.fir.txt
index 3fb8f3135c6..ff1af81bd4d 100644
--- a/compiler/testData/ir/irText/declarations/kt29833.fir.txt
+++ b/compiler/testData/ir/irText/declarations/kt29833.fir.txt
@@ -6,26 +6,26 @@ FILE fqName:interop fileName:/Definitions.kt
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Definitions modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:KT_CONSTANT visibility:public modality:FINAL [const,val] 
-      FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:IrErrorType visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:kotlin.String? visibility:public [final] 
         EXPRESSION_BODY
-          ERROR_CALL 'Unresolved reference: <Unresolved name: CONSTANT>#' type=IrErrorType
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-KT_CONSTANT> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:IrErrorType 
+          ERROR_CALL 'No getter found for R|interop/Interface.CONSTANT|' type=kotlin.String?
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-KT_CONSTANT> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String? 
         correspondingProperty: PROPERTY name:KT_CONSTANT visibility:public modality:FINAL [const,val] 
         $this: VALUE_PARAMETER name:<this> type:interop.Definitions 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-KT_CONSTANT> (): IrErrorType declared in interop.Definitions'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-KT_CONSTANT> (): kotlin.String? declared in interop.Definitions'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:KT_CONSTANT type:kotlin.String? visibility:public [final] ' type=kotlin.String? origin=null
               receiver: GET_VAR '<this>: interop.Definitions declared in interop.Definitions.<get-KT_CONSTANT>' type=interop.Definitions origin=null
     PROPERTY name:ktValue visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:ktValue type:IrErrorType visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String? visibility:public [final] 
         EXPRESSION_BODY
-          ERROR_CALL 'Unresolved reference: <Unresolved name: CONSTANT>#' type=IrErrorType
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ktValue> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:IrErrorType 
+          ERROR_CALL 'No getter found for R|interop/Interface.CONSTANT|' type=kotlin.String?
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-ktValue> visibility:public modality:FINAL <> ($this:interop.Definitions) returnType:kotlin.String? 
         correspondingProperty: PROPERTY name:ktValue visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:interop.Definitions 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-ktValue> (): IrErrorType declared in interop.Definitions'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ktValue type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-ktValue> (): kotlin.String? declared in interop.Definitions'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:ktValue type:kotlin.String? visibility:public [final] ' type=kotlin.String? origin=null
               receiver: GET_VAR '<this>: interop.Definitions declared in interop.Definitions.<get-ktValue>' type=interop.Definitions origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -40,3 +40,4 @@ FILE fqName:interop fileName:/Definitions.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt b/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt
index b4873504acb..89317318b12 100644
--- a/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt
+++ b/compiler/testData/ir/irText/declarations/localClassWithOverrides.fir.txt
@@ -21,19 +21,6 @@ FILE fqName:<root> fileName:/localClassWithOverrides.kt
             correspondingProperty: PROPERTY name:avar visibility:public modality:ABSTRACT [var] 
             $this: VALUE_PARAMETER name:<this> type:<root>.outer.ALocal 
             VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Int 
-        FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
-          overridden:
-            public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-          VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
-        FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
-          overridden:
-            public open fun hashCode (): kotlin.Int declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-        FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
-          overridden:
-            public open fun toString (): kotlin.String declared in kotlin.Any
-          $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
       CLASS CLASS name:Local modality:FINAL visibility:local superTypes:[IrErrorType]
         $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.outer.Local 
         CONSTRUCTOR visibility:public <> () returnType:IrErrorType [primary] 
@@ -73,3 +60,4 @@ FILE fqName:<root> fileName:/localClassWithOverrides.kt
               SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:avar type:kotlin.Int visibility:public ' type=kotlin.Unit origin=null
                 receiver: GET_VAR '<this>: <root>.outer.Local declared in <root>.outer.Local.<set-avar>' type=<root>.outer.Local origin=null
                 value: GET_VAR '<set-?>: kotlin.Int declared in <root>.outer.Local.<set-avar>' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt b/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt
index cdfcce9f992..cab86ae3afa 100644
--- a/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/localDelegatedProperties.fir.txt
@@ -13,3 +13,4 @@ FILE fqName:<root> fileName:/localDelegatedProperties.kt
       ERROR_CALL 'Unresolved reference: R|<local>/x|' type=IrErrorType
       GET_VAR 'val <unary>: IrErrorType [val] declared in <root>.test2' type=IrErrorType origin=null
       ERROR_CALL 'Unresolved reference: R|<local>/x|' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/declarations/localVarInDoWhile.fir.txt b/compiler/testData/ir/irText/declarations/localVarInDoWhile.fir.txt
index 883d7636c8f..f8d04b62b9d 100644
--- a/compiler/testData/ir/irText/declarations/localVarInDoWhile.fir.txt
+++ b/compiler/testData/ir/irText/declarations/localVarInDoWhile.fir.txt
@@ -9,3 +9,4 @@ FILE fqName:<root> fileName:/localVarInDoWhile.kt
           $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
             arg0: ERROR_CALL 'Unresolved reference: <Unresolved name: x>#' type=IrErrorType
             arg1: CONST Int type=kotlin.Unit value=42
+
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt
index 1596937577a..77d138347d7 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectClassInherited.fir.txt
@@ -93,3 +93,4 @@ FILE fqName:<root> fileName:/expectClassInherited.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt
index 489e760cee6..f7829a11853 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedEnumClass.fir.txt
@@ -150,3 +150,4 @@ FILE fqName:<root> fileName:/expectedEnumClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.fir.txt b/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.fir.txt
index d2b01cdf880..c9866d8803e 100644
--- a/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.fir.txt
+++ b/compiler/testData/ir/irText/declarations/multiplatform/expectedSealedClass.fir.txt
@@ -75,3 +75,4 @@ FILE fqName:<root> fileName:/expectedSealedClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
index 648f774803e..837477450db 100644
--- a/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
+++ b/compiler/testData/ir/irText/declarations/packageLevelProperties.fir.txt
@@ -81,3 +81,4 @@ FILE fqName:<root> fileName:/packageLevelProperties.kt
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test8 type:IrErrorType visibility:public [static] ' type=kotlin.Unit origin=null
           value: GET_VAR '<set-?>: IrErrorType declared in <root>.<set-test8>' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/class.fir.txt b/compiler/testData/ir/irText/declarations/parameters/class.fir.txt
index 00012200670..c46c27abad8 100644
--- a/compiler/testData/ir/irText/declarations/parameters/class.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/class.fir.txt
@@ -34,14 +34,14 @@ FILE fqName:<root> fileName:/class.kt
   CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test 
     TYPE_PARAMETER name:T0 index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Test<T0 of <root>.Test> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Test<T0 of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:TestNested modality:FINAL visibility:public superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test.TestNested 
       TYPE_PARAMETER name:T1 index:0 variance: superTypes:[]
-      CONSTRUCTOR visibility:public <> () returnType:<root>.Test.TestNested<T1 of <root>.Test.TestNested> [primary] 
+      CONSTRUCTOR visibility:public <> () returnType:<root>.Test.TestNested<T1 of <uninitialized parent>> [primary] 
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestNested modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -61,7 +61,7 @@ FILE fqName:<root> fileName:/class.kt
     CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test.TestInner 
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[]
-      CONSTRUCTOR visibility:public <> () returnType:<root>.Test.TestInner<T2 of <root>.Test.TestInner> [primary] 
+      CONSTRUCTOR visibility:public <> () returnType:<root>.Test.TestInner<T2 of <uninitialized parent>> [primary] 
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
@@ -91,3 +91,4 @@ FILE fqName:<root> fileName:/class.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/constructor.fir.txt b/compiler/testData/ir/irText/declarations/parameters/constructor.fir.txt
index 66cc06fd48d..0e4fbec9091 100644
--- a/compiler/testData/ir/irText/declarations/parameters/constructor.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/constructor.fir.txt
@@ -3,16 +3,16 @@ FILE fqName:<root> fileName:/constructor.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1 
     TYPE_PARAMETER name:T1 index:0 variance: superTypes:[]
     TYPE_PARAMETER name:T2 index:1 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T1 of <root>.Test1, y:T2 of <root>.Test1) returnType:<root>.Test1<T1 of <root>.Test1, T2 of <root>.Test1> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T1 of <root>.Test1 
-      VALUE_PARAMETER name:y index:1 type:T2 of <root>.Test1 
+    CONSTRUCTOR visibility:public <> (x:T1 of <uninitialized parent>, y:T2 of <uninitialized parent>) returnType:<root>.Test1<T1 of <uninitialized parent>, T2 of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T1 of <uninitialized parent> 
+      VALUE_PARAMETER name:y index:1 type:T2 of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:T1 of <root>.Test1 visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: T1 of <root>.Test1 declared in <root>.Test1.<init>' type=T1 of <root>.Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: T1 of <uninitialized parent> declared in <root>.Test1.<init>' type=T1 of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:T1 of <root>.Test1 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
@@ -23,7 +23,7 @@ FILE fqName:<root> fileName:/constructor.kt
     PROPERTY name:y visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:y type:T2 of <root>.Test1 visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'y: T2 of <root>.Test1 declared in <root>.Test1.<init>' type=T2 of <root>.Test1 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'y: T2 of <uninitialized parent> declared in <root>.Test1.<init>' type=T2 of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-y> visibility:public modality:FINAL <> ($this:<root>.Test1) returnType:T2 of <root>.Test1 
         correspondingProperty: PROPERTY name:y visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test1 
@@ -66,15 +66,15 @@ FILE fqName:<root> fileName:/constructor.kt
     CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test2.TestInner 
       TYPE_PARAMETER name:Z index:0 variance: superTypes:[]
-      CONSTRUCTOR visibility:public <> (z:Z of <root>.Test2.TestInner) returnType:<root>.Test2.TestInner<Z of <root>.Test2.TestInner> [primary] 
-        VALUE_PARAMETER name:z index:0 type:Z of <root>.Test2.TestInner 
+      CONSTRUCTOR visibility:public <> (z:Z of <uninitialized parent>) returnType:<root>.Test2.TestInner<Z of <uninitialized parent>> [primary] 
+        VALUE_PARAMETER name:z index:0 type:Z of <uninitialized parent> 
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:TestInner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
       PROPERTY name:z visibility:public modality:FINAL [val] 
         FIELD PROPERTY_BACKING_FIELD name:z type:Z of <root>.Test2.TestInner visibility:public [final] 
           EXPRESSION_BODY
-            GET_VAR 'z: Z of <root>.Test2.TestInner declared in <root>.Test2.TestInner.<init>' type=Z of <root>.Test2.TestInner origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+            GET_VAR 'z: Z of <uninitialized parent> declared in <root>.Test2.TestInner.<init>' type=Z of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-z> visibility:public modality:FINAL <> ($this:<root>.Test2.TestInner) returnType:Z of <root>.Test2.TestInner 
           correspondingProperty: PROPERTY name:z visibility:public modality:FINAL [val] 
           $this: VALUE_PARAMETER name:<this> type:<root>.Test2.TestInner 
@@ -82,12 +82,12 @@ FILE fqName:<root> fileName:/constructor.kt
             RETURN type=kotlin.Nothing from='public final fun <get-z> (): Z of <root>.Test2.TestInner declared in <root>.Test2.TestInner'
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:z type:Z of <root>.Test2.TestInner visibility:public [final] ' type=Z of <root>.Test2.TestInner origin=null
                 receiver: GET_VAR '<this>: <root>.Test2.TestInner declared in <root>.Test2.TestInner.<get-z>' type=<root>.Test2.TestInner origin=null
-      CONSTRUCTOR visibility:public <> (z:Z of <root>.Test2.TestInner, i:kotlin.Int) returnType:<root>.Test2.TestInner<Z of <root>.Test2.TestInner> 
-        VALUE_PARAMETER name:z index:0 type:Z of <root>.Test2.TestInner 
+      CONSTRUCTOR visibility:public <> (z:Z of <uninitialized parent>, i:kotlin.Int) returnType:<root>.Test2.TestInner<Z of <uninitialized parent>> 
+        VALUE_PARAMETER name:z index:0 type:Z of <uninitialized parent> 
         VALUE_PARAMETER name:i index:1 type:kotlin.Int 
         BLOCK_BODY
-          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (z: Z of <root>.Test2.TestInner) [primary] declared in <root>.Test2.TestInner'
-            z: GET_VAR 'z: Z of <root>.Test2.TestInner declared in <root>.Test2.TestInner.<init>' type=Z of <root>.Test2.TestInner origin=null
+          DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (z: Z of <uninitialized parent>) [primary] declared in <root>.Test2.TestInner'
+            z: GET_VAR 'z: Z of <uninitialized parent> declared in <root>.Test2.TestInner.<init>' type=Z of <uninitialized parent> origin=null
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
           public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -162,7 +162,7 @@ FILE fqName:<root> fileName:/constructor.kt
   CLASS CLASS name:Test4 modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test4 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test4<T of <root>.Test4> [primary] 
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int) returnType:<root>.Test4<T of <uninitialized parent>> [primary] 
       VALUE_PARAMETER name:x index:0 type:kotlin.Int 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
@@ -178,15 +178,15 @@ FILE fqName:<root> fileName:/constructor.kt
           RETURN type=kotlin.Nothing from='public final fun <get-x> (): kotlin.Int declared in <root>.Test4'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Test4 declared in <root>.Test4.<get-x>' type=<root>.Test4 origin=null
-    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Test4<T of <root>.Test4> 
+    CONSTRUCTOR visibility:public <> (x:kotlin.Int, y:kotlin.Int) returnType:<root>.Test4<T of <uninitialized parent>> 
       VALUE_PARAMETER name:x index:0 type:kotlin.Int 
       VALUE_PARAMETER name:y index:1 type:kotlin.Int 
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.Test4'
-          x: ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
-            GET_VAR 'y: kotlin.Int declared in <root>.Test4.<init>' type=kotlin.Int origin=null
+          x: CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            other: GET_VAR 'y: kotlin.Int declared in <root>.Test4.<init>' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -200,3 +200,4 @@ FILE fqName:<root> fileName:/constructor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt
index 35beb642328..f9ad0bace03 100644
--- a/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/dataClassMembers.fir.txt
@@ -2,8 +2,8 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
   CLASS CLASS name:Test modality:FINAL visibility:public [data] superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Test, y:kotlin.String) returnType:<root>.Test<T of <root>.Test> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Test 
+    CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>, y:kotlin.String) returnType:<root>.Test<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent> 
       VALUE_PARAMETER name:y index:1 type:kotlin.String 
         EXPRESSION_BODY
           CONST String type=kotlin.String value=""
@@ -13,7 +13,7 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Test visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: T of <root>.Test declared in <root>.Test.<init>' type=T of <root>.Test origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: T of <uninitialized parent> declared in <root>.Test.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Test) returnType:T of <root>.Test 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Test 
@@ -32,6 +32,16 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
           RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.String declared in <root>.Test'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.String visibility:public [final] ' type=kotlin.String origin=null
               receiver: GET_VAR '<this>: <root>.Test declared in <root>.Test.<get-y>' type=<root>.Test origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.Test) returnType:T of <root>.Test 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): T of <root>.Test declared in <root>.Test'
+          CALL 'public final fun <get-x> (): T of <root>.Test declared in <root>.Test' type=T of <root>.Test origin=null
+    FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.Test) returnType:kotlin.String 
+      $this: VALUE_PARAMETER name:<this> type:<root>.Test 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.String declared in <root>.Test'
+          CALL 'public final fun <get-y> (): kotlin.String declared in <root>.Test' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -45,3 +55,4 @@ FILE fqName:<root> fileName:/dataClassMembers.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.fir.txt b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.fir.txt
index efddf53737e..3148bb4bc31 100644
--- a/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/defaultPropertyAccessors.fir.txt
@@ -75,8 +75,8 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
   CLASS CLASS name:InPrimaryCtor modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.InPrimaryCtor 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (testInPrimaryCtor1:T of <root>.InPrimaryCtor, testInPrimaryCtor2:kotlin.Int) returnType:<root>.InPrimaryCtor<T of <root>.InPrimaryCtor> [primary] 
-      VALUE_PARAMETER name:testInPrimaryCtor1 index:0 type:T of <root>.InPrimaryCtor 
+    CONSTRUCTOR visibility:public <> (testInPrimaryCtor1:T of <uninitialized parent>, testInPrimaryCtor2:kotlin.Int) returnType:<root>.InPrimaryCtor<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:testInPrimaryCtor1 index:0 type:T of <uninitialized parent> 
       VALUE_PARAMETER name:testInPrimaryCtor2 index:1 type:kotlin.Int 
         EXPRESSION_BODY
           CONST Int type=kotlin.Int value=42
@@ -86,7 +86,7 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
     PROPERTY name:testInPrimaryCtor1 visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:testInPrimaryCtor1 type:T of <root>.InPrimaryCtor visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'testInPrimaryCtor1: T of <root>.InPrimaryCtor declared in <root>.InPrimaryCtor.<init>' type=T of <root>.InPrimaryCtor origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'testInPrimaryCtor1: T of <uninitialized parent> declared in <root>.InPrimaryCtor.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testInPrimaryCtor1> visibility:public modality:FINAL <> ($this:<root>.InPrimaryCtor) returnType:T of <root>.InPrimaryCtor 
         correspondingProperty: PROPERTY name:testInPrimaryCtor1 visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.InPrimaryCtor 
@@ -126,3 +126,4 @@ FILE fqName:<root> fileName:/defaultPropertyAccessors.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt
index 035d9c38eb9..14e5b935cb7 100644
--- a/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/delegatedMembers.fir.txt
@@ -1,37 +1,38 @@
 FILE fqName:<root> fileName:/delegatedMembers.kt
   CLASS INTERFACE name:IBase modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IBase
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IBase 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IBase, x:kotlin.Int) returnType:kotlin.Unit
-      $this: VALUE_PARAMETER name:<this> type:<root>.IBase
-      VALUE_PARAMETER name:x index:0 type:kotlin.Int
-    PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.IBase) returnType:kotlin.Int
-        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val]
-        $this: VALUE_PARAMETER name:<this> type:<root>.IBase
-    FUN name:qux visibility:public modality:ABSTRACT <X> ($this:<root>.IBase, t:T of <root>.IBase, x:X of <root>.IBase.qux) returnType:kotlin.Unit
+    FUN name:foo visibility:public modality:ABSTRACT <> ($this:<root>.IBase, x:kotlin.Int) returnType:kotlin.Unit 
+      $this: VALUE_PARAMETER name:<this> type:<root>.IBase 
+      VALUE_PARAMETER name:x index:0 type:kotlin.Int 
+    PROPERTY name:bar visibility:public modality:ABSTRACT [val] 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:ABSTRACT <> ($this:<root>.IBase) returnType:kotlin.Int 
+        correspondingProperty: PROPERTY name:bar visibility:public modality:ABSTRACT [val] 
+        $this: VALUE_PARAMETER name:<this> type:<root>.IBase 
+    FUN name:qux visibility:public modality:ABSTRACT <X> ($this:<root>.IBase, t:T of <root>.IBase, x:X of <root>.IBase.qux) returnType:kotlin.Unit 
       TYPE_PARAMETER name:X index:0 variance: superTypes:[]
-      $this: VALUE_PARAMETER name:<this> type:<root>.IBase
-      VALUE_PARAMETER name:t index:0 type:T of <root>.IBase
-      VALUE_PARAMETER name:x index:1 type:X of <root>.IBase.qux
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean
+      $this: VALUE_PARAMETER name:<this> type:<root>.IBase 
+      VALUE_PARAMETER name:t index:0 type:T of <root>.IBase 
+      VALUE_PARAMETER name:x index:1 type:X of <root>.IBase.qux 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any?
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[]
-    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test
+    $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test 
     TYPE_PARAMETER name:TT index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (impl:<root>.IBase<TT of <root>.Test>) returnType:<root>.Test<TT of <root>.Test> [primary]
-      VALUE_PARAMETER name:impl index:0 type:<root>.IBase<TT of <root>.Test>
+    CONSTRUCTOR visibility:public <> (impl:<root>.IBase<TT of <uninitialized parent>>) returnType:<root>.Test<TT of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:impl index:0 type:<root>.IBase<TT of <uninitialized parent>> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test modality:FINAL visibility:public superTypes:[]'
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/fun.fir.txt b/compiler/testData/ir/irText/declarations/parameters/fun.fir.txt
index 8e75eb6b904..5396b73d911 100644
--- a/compiler/testData/ir/irText/declarations/parameters/fun.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/fun.fir.txt
@@ -12,8 +12,8 @@ FILE fqName:<root> fileName:/fun.kt
       EXPRESSION_BODY
         CONST String type=kotlin.String value=""
     BLOCK_BODY
-  FUN name:test3 visibility:public modality:FINAL <> (args:kotlin.String) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:args index:0 type:kotlin.String 
+  FUN name:test3 visibility:public modality:FINAL <> (args:kotlin.Array<kotlin.String>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:args index:0 type:kotlin.Array<kotlin.String> 
     BLOCK_BODY
   FUN name:textExt1 visibility:public modality:FINAL <> (i:kotlin.Int, j:kotlin.String) returnType:kotlin.Unit 
     VALUE_PARAMETER name:i index:0 type:kotlin.Int 
@@ -49,3 +49,4 @@ FILE fqName:<root> fileName:/fun.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt
index 0271c7a468a..8c781e7bbaf 100644
--- a/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/genericInnerClass.fir.txt
@@ -2,14 +2,14 @@ FILE fqName:<root> fileName:/genericInnerClass.kt
   CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer 
     TYPE_PARAMETER name:T1 index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Outer<T1 of <root>.Outer> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Outer<T1 of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer.Inner 
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[]
-      CONSTRUCTOR visibility:public <> () returnType:<root>.Outer.Inner<T2 of <root>.Outer.Inner> [primary] 
+      CONSTRUCTOR visibility:public <> () returnType:<root>.Outer.Inner<T2 of <uninitialized parent>> [primary] 
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Inner modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
@@ -44,3 +44,4 @@ FILE fqName:<root> fileName:/genericInnerClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/lambdas.fir.txt b/compiler/testData/ir/irText/declarations/parameters/lambdas.fir.txt
index 4b2ce3033cc..7323771867b 100644
--- a/compiler/testData/ir/irText/declarations/parameters/lambdas.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/lambdas.fir.txt
@@ -1,32 +1,30 @@
 FILE fqName:<root> fileName:/lambdas.kt
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1<kotlin.String, kotlin.String> visibility:public [final,static] 
       EXPRESSION_BODY
-        BLOCK type=kotlin.Function1 origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function1 
+        BLOCK type=kotlin.Function1<kotlin.String, kotlin.String> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function1<kotlin.String, kotlin.String> 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Function1 declared in <root>.test1'
-                ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function1 declared in <root>.test1' type=kotlin.Function1 origin=LAMBDA
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function1 
+              ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function1<kotlin.String, kotlin.String> declared in <root>.test1' type=kotlin.Function1<kotlin.String, kotlin.String> origin=LAMBDA
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.String, kotlin.String> 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function1 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static] ' type=kotlin.Function1 origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function1<kotlin.String, kotlin.String> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1<kotlin.String, kotlin.String> visibility:public [final,static] ' type=kotlin.Function1<kotlin.String, kotlin.String> origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function2 visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> visibility:public [final,static] 
       EXPRESSION_BODY
-        BLOCK type=kotlin.Function2 origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function2 
+        BLOCK type=kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Function2 declared in <root>.test2'
-                ERROR_CALL 'Unresolved reference: <Unresolved name: hashCode>#' type=IrErrorType
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function2 declared in <root>.test2' type=kotlin.Function2 origin=LAMBDA
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Function2 
+              ERROR_CALL 'Unresolved reference: <Unresolved name: hashCode>#' type=IrErrorType
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> declared in <root>.test2' type=kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> origin=LAMBDA
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Function2 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function2 visibility:public [final,static] ' type=kotlin.Function2 origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> visibility:public [final,static] ' type=kotlin.Function2<kotlin.Any, kotlin.Any, kotlin.Any> origin=null
   PROPERTY name:test3 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:public [final,static] 
       EXPRESSION_BODY
@@ -35,8 +33,7 @@ FILE fqName:<root> fileName:/lambdas.kt
             VALUE_PARAMETER name:i index:0 type:kotlin.Int 
             VALUE_PARAMETER name:j index:1 type:kotlin.Int 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (i: kotlin.Int, j: kotlin.Int): IrErrorType declared in <root>.test3'
-                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+              GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
           FUNCTION_REFERENCE 'local final fun <anonymous> (i: kotlin.Int, j: kotlin.Int): IrErrorType declared in <root>.test3' type=IrErrorType origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] 
@@ -57,3 +54,4 @@ FILE fqName:<root> fileName:/lambdas.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test4> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/localFun.fir.txt b/compiler/testData/ir/irText/declarations/parameters/localFun.fir.txt
index 9f38423fd75..ca2784275e7 100644
--- a/compiler/testData/ir/irText/declarations/parameters/localFun.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/localFun.fir.txt
@@ -15,10 +15,11 @@ FILE fqName:<root> fileName:/localFun.kt
           EXPRESSION_BODY
             CONST String type=kotlin.String value=""
         BLOCK_BODY
-      FUN name:test3 visibility:local modality:FINAL <> (args:kotlin.String) returnType:kotlin.Unit 
-        VALUE_PARAMETER name:args index:0 type:kotlin.String 
+      FUN name:test3 visibility:local modality:FINAL <> (args:kotlin.Array<kotlin.String>) returnType:kotlin.Unit 
+        VALUE_PARAMETER name:args index:0 type:kotlin.Array<kotlin.String> 
         BLOCK_BODY
       FUN name:textExt1 visibility:local modality:FINAL <> (i:kotlin.Int, j:TT of <root>.outer) returnType:kotlin.Unit 
         VALUE_PARAMETER name:i index:0 type:kotlin.Int 
         VALUE_PARAMETER name:j index:1 type:TT of <root>.outer 
         BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.fir.txt b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.fir.txt
index bbf3e87136e..96c78d2bb68 100644
--- a/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/propertyAccessors.fir.txt
@@ -50,7 +50,7 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
   CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Host<T of <root>.Host> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Host<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -124,3 +124,4 @@ FILE fqName:<root> fileName:/propertyAccessors.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.fir.txt b/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.fir.txt
index ea885a1fce8..300983f67de 100644
--- a/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/typeParameterBeforeBound.fir.txt
@@ -3,7 +3,7 @@ FILE fqName:<root> fileName:/typeParameterBeforeBound.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test1 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     TYPE_PARAMETER name:U index:1 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Test1<T of <root>.Test1, U of <root>.Test1> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Test1<T of <uninitialized parent>, U of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Test1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -32,3 +32,4 @@ FILE fqName:<root> fileName:/typeParameterBeforeBound.kt
       correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [var] 
       VALUE_PARAMETER name:value index:0 type:kotlin.Unit 
       BLOCK_BODY
+
diff --git a/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.fir.txt b/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.fir.txt
index f3ddd77766d..5476fb2dab0 100644
--- a/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.fir.txt
+++ b/compiler/testData/ir/irText/declarations/parameters/typeParameterBoundedBySubclass.fir.txt
@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/typeParameterBoundedBySubclass.kt
   CLASS CLASS name:Base1 modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base1 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Base1<T of <root>.Base1> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Base1<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base1 modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
@@ -86,3 +86,4 @@ FILE fqName:<root> fileName:/typeParameterBoundedBySubclass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt
index 0615c8edf35..ee1a3535f54 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/differentReceivers.fir.txt
@@ -59,10 +59,11 @@ FILE fqName:<root> fileName:/differentReceivers.kt
   PROPERTY name:testOK visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:testOK type:IrErrorType visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/plus, kotlin/plus, kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/text/plus]>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/plus, kotlin/plus, kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/text/plus]>#' type=IrErrorType
           CALL 'public final fun <get-testK> (): IrErrorType declared in <root>' type=IrErrorType origin=null
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testOK> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:testOK visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-testOK> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testOK type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt
index 37a076bd460..ad6ea8fb971 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/local.fir.txt
@@ -78,3 +78,4 @@ FILE fqName:<root> fileName:/local.kt
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
       VAR name:testMember type:IrErrorType [val] 
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt
index 91cae222342..5c1c7beff63 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/localDifferentReceivers.fir.txt
@@ -47,7 +47,8 @@ FILE fqName:<root> fileName:/localDifferentReceivers.kt
       VAR name:testO type:IrErrorType [val] 
       VAR name:testK type:IrErrorType [val] 
       VAR name:testOK type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/plus, kotlin/plus, kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/text/plus]>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/plus, kotlin/plus, kotlin/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/collections/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/sequences/plus, kotlin/text/plus]>#' type=IrErrorType
           GET_VAR 'val testK: IrErrorType [val] declared in <root>.box' type=IrErrorType origin=null
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         GET_VAR 'val testOK: IrErrorType [val] declared in <root>.box' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt
index 8f3591ce70f..8d41e8c5ef8 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/member.fir.txt
@@ -103,3 +103,4 @@ FILE fqName:<root> fileName:/member.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt
index dfa0f7c6ef9..a11fade9c57 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/memberExtension.fir.txt
@@ -44,14 +44,13 @@ FILE fqName:<root> fileName:/memberExtension.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN name:provideDelegate visibility:public modality:FINAL <> ($this:<root>.Host, host:kotlin.Any?, p:kotlin.Any) returnType:IrErrorType 
+    FUN name:provideDelegate visibility:public modality:FINAL <> ($this:<root>.Host, host:kotlin.Any?, p:kotlin.Any) returnType:<root>.Host.StringDelegate 
       $this: VALUE_PARAMETER name:<this> type:<root>.Host 
       VALUE_PARAMETER name:host index:0 type:kotlin.Any? 
       VALUE_PARAMETER name:p index:1 type:kotlin.Any 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): IrErrorType declared in <root>.Host'
-          ERROR_CALL 'Unresolved reference: <Unresolved name: StringDelegate>#' type=IrErrorType
-            ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
+        RETURN type=kotlin.Nothing from='public final fun provideDelegate (host: kotlin.Any?, p: kotlin.Any): <root>.Host.StringDelegate declared in <root>.Host'
+          CONSTRUCTOR_CALL 'public constructor <init> (s: kotlin.String) [primary] declared in <root>.Host.StringDelegate' type=<root>.Host.StringDelegate origin=null
     PROPERTY name:plusK visibility:public modality:FINAL [delegated,val] 
       FIELD PROPERTY_BACKING_FIELD name:plusK type:IrErrorType visibility:public [final] 
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-plusK> visibility:public modality:FINAL <> ($this:<root>.Host) returnType:IrErrorType 
@@ -85,3 +84,4 @@ FILE fqName:<root> fileName:/memberExtension.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt
index 09f183fcfcd..b2a768da514 100644
--- a/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt
+++ b/compiler/testData/ir/irText/declarations/provideDelegate/topLevel.fir.txt
@@ -82,3 +82,4 @@ FILE fqName:<root> fileName:/topLevel.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-testTopLevel> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testTopLevel type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.fir.txt b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.fir.txt
index 4302af1a7b9..21a78f78e8e 100644
--- a/compiler/testData/ir/irText/errors/suppressedNonPublicCall.fir.txt
+++ b/compiler/testData/ir/irText/errors/suppressedNonPublicCall.fir.txt
@@ -24,3 +24,4 @@ FILE fqName:<root> fileName:/suppressedNonPublicCall.kt
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit [inline] 
     BLOCK_BODY
       CALL 'internal final fun bar (): kotlin.Unit declared in <root>.C' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/errors/unresolvedReference.fir.txt b/compiler/testData/ir/irText/errors/unresolvedReference.fir.txt
index 0e1bb25c69c..c4bb6328db0 100644
--- a/compiler/testData/ir/irText/errors/unresolvedReference.fir.txt
+++ b/compiler/testData/ir/irText/errors/unresolvedReference.fir.txt
@@ -37,3 +37,4 @@ FILE fqName:<root> fileName:/unresolvedReference.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test4> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/argumentMappedWithError.fir.txt b/compiler/testData/ir/irText/expressions/argumentMappedWithError.fir.txt
index 115801314b7..522213287bd 100644
--- a/compiler/testData/ir/irText/expressions/argumentMappedWithError.fir.txt
+++ b/compiler/testData/ir/irText/expressions/argumentMappedWithError.fir.txt
@@ -13,5 +13,6 @@ FILE fqName:<root> fileName:/argumentMappedWithError.kt
       VAR name:x type:kotlin.Int [val] 
         CONST Int type=kotlin.Int value=0
       CALL 'public final fun foo (arg: kotlin.Number): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        arg: CALL 'public final fun convert <R> (): R of <root>.convert declared in <root>' type=R of <root>.convert origin=null
+        arg: CALL 'public final fun convert <R> (): R of <root>.convert declared in <root>' type=kotlin.Number origin=null
           <R>: <none>
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt b/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt
index 14e58a2f2ea..7899b7f0a60 100644
--- a/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAccess.fir.txt
@@ -12,10 +12,11 @@ FILE fqName:<root> fileName:/arrayAccess.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Int declared in <root>'
         CONST Int type=kotlin.Int value=1
-  FUN name:test visibility:public modality:FINAL <> (a:kotlin.IntArray) returnType:kotlin.String 
+  FUN name:test visibility:public modality:FINAL <> (a:kotlin.IntArray) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.IntArray 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (a: kotlin.IntArray): kotlin.String declared in <root>'
-        CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin' type=kotlin.String origin=null
+      RETURN type=kotlin.Nothing from='public final fun test (a: kotlin.IntArray): kotlin.Int declared in <root>'
+        CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           other: CALL 'public final fun get (index: kotlin.Int): kotlin.Int declared in kotlin.IntArray' type=kotlin.Int origin=null
             index: CALL 'public final fun foo (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAssignment.fir.txt b/compiler/testData/ir/irText/expressions/arrayAssignment.fir.txt
index cadb71b4263..9d7a21bc505 100644
--- a/compiler/testData/ir/irText/expressions/arrayAssignment.fir.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAssignment.fir.txt
@@ -18,3 +18,4 @@ FILE fqName:<root> fileName:/arrayAssignment.kt
       CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in kotlin.IntArray' type=kotlin.Unit origin=null
         index: CALL 'public final fun foo (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
         value: CONST Int type=kotlin.Int value=1
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt
index 767c2f0279a..a47858dace9 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment1.fir.txt
@@ -59,6 +59,6 @@ FILE fqName:<root> fileName:/arrayAugmentedAssignment1.kt
           index: CONST Int type=kotlin.Int value=0
       CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in kotlin.IntArray' type=kotlin.Unit origin=null
         index: CONST Int type=kotlin.Int value=0
-        value: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-          GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testMember' type=kotlin.Int origin=null
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testMember' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.fir.txt b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.fir.txt
index 19c0f03398e..11ef60b5c73 100644
--- a/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.fir.txt
+++ b/compiler/testData/ir/irText/expressions/arrayAugmentedAssignment2.fir.txt
@@ -40,3 +40,4 @@ FILE fqName:<root> fileName:/arrayAugmentedAssignment2.kt
     VALUE_PARAMETER name:a index:0 type:<root>.IA 
     BLOCK_BODY
       ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
+
diff --git a/compiler/testData/ir/irText/expressions/assignments.fir.txt b/compiler/testData/ir/irText/expressions/assignments.fir.txt
index ba99c5ebf3f..c2814d9ffef 100644
--- a/compiler/testData/ir/irText/expressions/assignments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/assignments.fir.txt
@@ -49,3 +49,4 @@ FILE fqName:<root> fileName:/assignments.kt
     BLOCK_BODY
       SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
         value: CONST Int type=kotlin.Int value=0
+
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt
index b05355d6faf..78b7156edff 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment1.fir.txt
@@ -35,3 +35,4 @@ FILE fqName:<root> fileName:/augmentedAssignment1.kt
         value: CONST Int type=kotlin.Int value=4
       SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
         value: CONST Int type=kotlin.Int value=5
+
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt
index 3b870cf4c5b..0d3a3dba1b6 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignment2.fir.txt
@@ -63,3 +63,4 @@ FILE fqName:<root> fileName:/augmentedAssignment2.kt
         value: CONST String type=kotlin.String value="/="
       SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:<root>.A visibility:public [final,static] ' type=<root>.A origin=null
         value: CONST String type=kotlin.String value="%="
+
diff --git a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt
index a6f86000d80..781c4910d3b 100644
--- a/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt
+++ b/compiler/testData/ir/irText/expressions/augmentedAssignmentWithExpression.fir.txt
@@ -38,9 +38,10 @@ FILE fqName:<root> fileName:/augmentedAssignmentWithExpression.kt
       VAR name:<complex-set> type:<root>.Host [val] 
         CALL 'public final fun foo (): <root>.Host declared in <root>' type=<root>.Host origin=null
       ERROR_CALL 'Unresolved reference: R|<local>/<complex-set>|' type=IrErrorType
-  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Function0<<root>.Host>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<<root>.Host> 
     BLOCK_BODY
       VAR name:<complex-set> type:IrErrorType [val] 
         ERROR_CALL 'Unresolved reference: <Unresolved name: a>#' type=IrErrorType
       ERROR_CALL 'Unresolved reference: R|<local>/<complex-set>|' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt b/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt
index 131c1b9d9bb..7fe538ebd14 100644
--- a/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt
+++ b/compiler/testData/ir/irText/expressions/badBreakContinue.fir.txt
@@ -19,10 +19,8 @@ FILE fqName:<root> fileName:/badBreakContinue.kt
             BLOCK type=IrErrorType origin=LAMBDA
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test3'
-                    BLOCK type=kotlin.Nothing origin=null
-                      BREAK label=L1 loop.label=L1
-                      CONTINUE label=L1 loop.label=L1
+                  BREAK label=L1 loop.label=L1
+                  CONTINUE label=L1 loop.label=L1
               FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test3' type=IrErrorType origin=LAMBDA
   FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
@@ -32,3 +30,4 @@ FILE fqName:<root> fileName:/badBreakContinue.kt
       WHILE label=null origin=WHILE_LOOP
         condition: ERROR_EXPR 'Unbound loop: continue@@@[ERROR_EXPR(Cannot bind unlabeled jump to a loop)] ' type=kotlin.Nothing
         body: BLOCK type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/bangbang.fir.txt b/compiler/testData/ir/irText/expressions/bangbang.fir.txt
index 960a4b9bdc4..bd948b8304b 100644
--- a/compiler/testData/ir/irText/expressions/bangbang.fir.txt
+++ b/compiler/testData/ir/irText/expressions/bangbang.fir.txt
@@ -1,12 +1,12 @@
 FILE fqName:<root> fileName:/bangbang.kt
-  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Any?) returnType:kotlin.Nothing
+  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Any?) returnType:kotlin.Any? 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Any?): kotlin.Nothing declared in <root>'
-        BLOCK type=kotlin.Nothing origin=EXCLEXCL
+      RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Any?): kotlin.Any? declared in <root>'
+        BLOCK type=kotlin.Any? origin=EXCLEXCL
           VAR name:<bangbang> type:kotlin.Any? [val] 
             GET_VAR 'a: kotlin.Any? declared in <root>.test1' type=kotlin.Any? origin=null
-          WHEN type=kotlin.Nothing origin=EXCLEXCL
+          WHEN type=kotlin.Any? origin=EXCLEXCL
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val <bangbang>: kotlin.Any? [val] declared in <root>.test1' type=kotlin.Any? origin=null
@@ -16,20 +16,21 @@ FILE fqName:<root> fileName:/bangbang.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val <bangbang>: kotlin.Any? [val] declared in <root>.test1' type=kotlin.Any? origin=null
-  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Any?) returnType:kotlin.Nothing
+  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Any?) returnType:IrErrorType 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Any?): kotlin.Nothing declared in <root>'
-        BLOCK type=kotlin.Nothing origin=EXCLEXCL
-          VAR name:<bangbang> type:kotlin.Int [val] 
-            CALL 'public open fun hashCode (): kotlin.Int declared in kotlin.Any' type=kotlin.Int origin=null
-          WHEN type=kotlin.Nothing origin=EXCLEXCL
+      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Any?): IrErrorType declared in <root>'
+        BLOCK type=IrErrorType origin=EXCLEXCL
+          VAR name:<bangbang> type:IrErrorType [val] 
+            ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/Any.hashCode]>#' type=IrErrorType
+          WHEN type=IrErrorType origin=EXCLEXCL
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_VAR 'val <bangbang>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
+                arg0: GET_VAR 'val <bangbang>: IrErrorType [val] declared in <root>.test2' type=IrErrorType origin=null
                 arg1: CONST Null type=kotlin.Nothing? value=null
               then: THROW type=kotlin.Nothing
                 ERROR_CALL 'Unresolved reference: <Unresolved name: KotlinNullPointerException>#' type=IrErrorType
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: GET_VAR 'val <bangbang>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
+              then: GET_VAR 'val <bangbang>: IrErrorType [val] declared in <root>.test2' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.fir.txt b/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.fir.txt
index 8c29496761c..1f1fdfa79ca 100644
--- a/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.fir.txt
+++ b/compiler/testData/ir/irText/expressions/booleanConstsInAndAndOrOr.fir.txt
@@ -21,3 +21,4 @@ FILE fqName:<root> fileName:/booleanConstsInAndAndOrOr.kt
           if: CONST Boolean type=kotlin.Boolean value=true
           then: RETURN type=kotlin.Nothing from='public final fun test2 (b: kotlin.Boolean): kotlin.Unit declared in <root>'
             GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+
diff --git a/compiler/testData/ir/irText/expressions/booleanOperators.fir.txt b/compiler/testData/ir/irText/expressions/booleanOperators.fir.txt
index f7510c66e9b..08349794c70 100644
--- a/compiler/testData/ir/irText/expressions/booleanOperators.fir.txt
+++ b/compiler/testData/ir/irText/expressions/booleanOperators.fir.txt
@@ -37,3 +37,4 @@ FILE fqName:<root> fileName:/booleanOperators.kt
       RETURN type=kotlin.Nothing from='public final fun test2x (a: kotlin.Boolean, b: kotlin.Boolean): kotlin.Boolean declared in <root>'
         CALL 'public final fun or (other: kotlin.Boolean): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null
           other: GET_VAR 'b: kotlin.Boolean declared in <root>.test2x' type=kotlin.Boolean origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/boundCallableReferences.fir.txt b/compiler/testData/ir/irText/expressions/boundCallableReferences.fir.txt
index 0f02c98dfbf..f2526deeec4 100644
--- a/compiler/testData/ir/irText/expressions/boundCallableReferences.fir.txt
+++ b/compiler/testData/ir/irText/expressions/boundCallableReferences.fir.txt
@@ -61,3 +61,4 @@ FILE fqName:<root> fileName:/boundCallableReferences.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test3> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/breakContinue.fir.txt b/compiler/testData/ir/irText/expressions/breakContinue.fir.txt
index f0522517735..2c23d3445b4 100644
--- a/compiler/testData/ir/irText/expressions/breakContinue.fir.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinue.fir.txt
@@ -49,3 +49,4 @@ FILE fqName:<root> fileName:/breakContinue.kt
             condition: CONST Boolean type=kotlin.Boolean value=true
             body: CONTINUE label=L loop.label=L
           CONTINUE label=L loop.label=L
+
diff --git a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
index 5af9aba2f79..8c7f3ff6722 100644
--- a/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
+++ b/compiler/testData/ir/irText/expressions/breakContinueInLoopHeader.fir.txt
@@ -45,11 +45,11 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
         body: BLOCK type=kotlin.Unit origin=null
-          VAR name:<range> type:kotlin.Nothing [val]
-            BLOCK type=kotlin.Nothing origin=ELVIS
+          VAR name:<range> type:kotlin.collections.List<kotlin.String>? [val] 
+            BLOCK type=kotlin.collections.List<kotlin.String>? origin=ELVIS
               VAR name:<elvis> type:kotlin.collections.List<kotlin.String>? [val] 
                 GET_VAR 'ss: kotlin.collections.List<kotlin.String>? declared in <root>.test3' type=kotlin.collections.List<kotlin.String>? origin=null
-              WHEN type=kotlin.Nothing origin=ELVIS
+              WHEN type=kotlin.collections.List<kotlin.String>? origin=ELVIS
                 BRANCH
                   if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                     arg0: GET_VAR 'val <elvis>: kotlin.collections.List<kotlin.String>? [val] declared in <root>.test3' type=kotlin.collections.List<kotlin.String>? origin=null
@@ -59,7 +59,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: GET_VAR 'val <elvis>: kotlin.collections.List<kotlin.String>? [val] declared in <root>.test3' type=kotlin.collections.List<kotlin.String>? origin=null
           VAR name:<iterator> type:IrErrorType [val] 
-            ERROR_CALL 'Unresolved reference: <Unresolved name: iterator>#' type=IrErrorType
+            ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/collections/List.iterator]>#' type=IrErrorType
           WHILE label=L2 origin=FOR_LOOP_INNER_WHILE
             condition: ERROR_CALL 'Unresolved reference: <Unresolved name: hasNext>#' type=IrErrorType
             body: BLOCK type=kotlin.Unit origin=null
@@ -71,11 +71,11 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
       WHILE label=L origin=WHILE_LOOP
         condition: CONST Boolean type=kotlin.Boolean value=true
         body: BLOCK type=kotlin.Unit origin=null
-          VAR name:<range> type:kotlin.Nothing [val]
-            BLOCK type=kotlin.Nothing origin=ELVIS
+          VAR name:<range> type:kotlin.collections.List<kotlin.String>? [val] 
+            BLOCK type=kotlin.collections.List<kotlin.String>? origin=ELVIS
               VAR name:<elvis> type:kotlin.collections.List<kotlin.String>? [val] 
                 GET_VAR 'ss: kotlin.collections.List<kotlin.String>? declared in <root>.test4' type=kotlin.collections.List<kotlin.String>? origin=null
-              WHEN type=kotlin.Nothing origin=ELVIS
+              WHEN type=kotlin.collections.List<kotlin.String>? origin=ELVIS
                 BRANCH
                   if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                     arg0: GET_VAR 'val <elvis>: kotlin.collections.List<kotlin.String>? [val] declared in <root>.test4' type=kotlin.collections.List<kotlin.String>? origin=null
@@ -85,7 +85,7 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                   if: CONST Boolean type=kotlin.Boolean value=true
                   then: GET_VAR 'val <elvis>: kotlin.collections.List<kotlin.String>? [val] declared in <root>.test4' type=kotlin.collections.List<kotlin.String>? origin=null
           VAR name:<iterator> type:IrErrorType [val] 
-            ERROR_CALL 'Unresolved reference: <Unresolved name: iterator>#' type=IrErrorType
+            ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/collections/List.iterator]>#' type=IrErrorType
           WHILE label=L2 origin=FOR_LOOP_INNER_WHILE
             condition: ERROR_CALL 'Unresolved reference: <Unresolved name: hasNext>#' type=IrErrorType
             body: BLOCK type=kotlin.Unit origin=null
@@ -123,3 +123,4 @@ FILE fqName:<root> fileName:/breakContinueInLoopHeader.kt
                 arg0: GET_VAR 'var i: kotlin.Int [var] declared in <root>.test5' type=kotlin.Int origin=null
                 arg1: CONST Int type=kotlin.Unit value=3
               then: BREAK label=null loop.label=Outer
+
diff --git a/compiler/testData/ir/irText/expressions/callWithReorderedArguments.fir.txt b/compiler/testData/ir/irText/expressions/callWithReorderedArguments.fir.txt
index 2a3745f2fe6..2827e663223 100644
--- a/compiler/testData/ir/irText/expressions/callWithReorderedArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callWithReorderedArguments.fir.txt
@@ -30,3 +30,4 @@ FILE fqName:<root> fileName:/callWithReorderedArguments.kt
       CALL 'public final fun foo (a: kotlin.Int, b: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         a: CONST Int type=kotlin.Int value=1
         b: CALL 'public final fun reordered2 (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt b/compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt
index e5b9da140b4..e2cbbc7eae4 100644
--- a/compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableRefToGenericMember.fir.txt
@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/callableRefToGenericMember.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.A<T of <root>.A> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.A<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -51,3 +51,4 @@ FILE fqName:<root> fileName:/callableRefToGenericMember.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt b/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt
index e2f4e4fbda2..7bbfb72e5e8 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferenceToImportedFromObject.fir.txt
@@ -70,3 +70,4 @@ FILE fqName:test fileName:/callableReferenceToImportedFromObject.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2a> (): IrErrorType declared in test'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2a type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt b/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt
index 40766289b3a..e5f3d64d5d5 100644
--- a/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/callableReferenceTypeArguments.fir.txt
@@ -32,29 +32,30 @@ FILE fqName:<root> fileName:/callableReferenceTypeArguments.kt
     VALUE_PARAMETER name:x index:0 type:kotlin.collections.List<T of <root>.topLevel2> 
     BLOCK_BODY
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1<kotlin.Int, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
         ERROR_CALL 'Unresolved reference: <Unresolved name: topLevel1>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function1 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.Int, kotlin.Unit> 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function1 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1 visibility:public [final,static] ' type=kotlin.Function1 origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function1<kotlin.Int, kotlin.Unit> visibility:public [final,static] ' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1 visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
         ERROR_CALL 'Unresolved reference: <Unresolved name: topLevel2>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Function1 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Function1 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1 visibility:public [final,static] ' type=kotlin.Function1 origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> visibility:public [final,static] ' type=kotlin.Function1<kotlin.collections.List<kotlin.String>, kotlin.Unit> origin=null
   PROPERTY name:test3 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1<kotlin.Int, kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
         ERROR_CALL 'Unresolved reference: <Unresolved name: objectMember>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.Function1 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.Function1<kotlin.Int, kotlin.Unit> 
       correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test3> (): kotlin.Function1 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1 visibility:public [final,static] ' type=kotlin.Function1 origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test3> (): kotlin.Function1<kotlin.Int, kotlin.Unit> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Function1<kotlin.Int, kotlin.Unit> visibility:public [final,static] ' type=kotlin.Function1<kotlin.Int, kotlin.Unit> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/calls.fir.txt b/compiler/testData/ir/irText/expressions/calls.fir.txt
index e2beb68b050..4d6fc881f86 100644
--- a/compiler/testData/ir/irText/expressions/calls.fir.txt
+++ b/compiler/testData/ir/irText/expressions/calls.fir.txt
@@ -37,5 +37,6 @@ FILE fqName:<root> fileName:/calls.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun ext3 (x: kotlin.Int): kotlin.Int declared in <root>'
         CALL 'public final fun foo (x: kotlin.Int, y: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          x: CALL 'public final fun ext1 (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+          x: ERROR_CALL 'Unresolved reference: <Unresolved name: ext1>#' type=IrErrorType
           y: GET_VAR 'x: kotlin.Int declared in <root>.ext3' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt b/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt
index 34bd16cf849..ecd6f990d5e 100644
--- a/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt
+++ b/compiler/testData/ir/irText/expressions/castToTypeParameter.fir.txt
@@ -22,7 +22,7 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
   CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Host<T of <root>.Host> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Host<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -83,3 +83,4 @@ FILE fqName:<root> fileName:/castToTypeParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.txt b/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.txt
index c2ecd794ff4..a8198d14008 100644
--- a/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.txt
+++ b/compiler/testData/ir/irText/expressions/catchParameterAccess.fir.txt
@@ -1,11 +1,12 @@
 FILE fqName:<root> fileName:/catchParameterAccess.kt
-  FUN name:test visibility:public modality:FINAL <> (f:kotlin.Function0) returnType:IrErrorType 
-    VALUE_PARAMETER name:f index:0 type:kotlin.Function0 
+  FUN name:test visibility:public modality:FINAL <> (f:kotlin.Function0<kotlin.Unit>) returnType:IrErrorType 
+    VALUE_PARAMETER name:f index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (f: kotlin.Function0): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test (f: kotlin.Function0<kotlin.Unit>): IrErrorType declared in <root>'
         TRY type=IrErrorType
           try: ERROR_CALL 'Unresolved reference: <Unresolved name: f>#' type=IrErrorType
           CATCH parameter=val e: java.lang.Exception [val] declared in <root>.test
             VAR name:e type:java.lang.Exception [val] 
             THROW type=kotlin.Nothing
               GET_VAR 'val e: java.lang.Exception [val] declared in <root>.test' type=java.lang.Exception origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt
index 65e2b2c67db..15b3c854e8b 100644
--- a/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt
+++ b/compiler/testData/ir/irText/expressions/chainOfSafeCalls.fir.txt
@@ -28,8 +28,9 @@ FILE fqName:<root> fileName:/chainOfSafeCalls.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:test visibility:public modality:FINAL <> (nc:<root>.C?) returnType:<root>.C 
+  FUN name:test visibility:public modality:FINAL <> (nc:<root>.C?) returnType:IrErrorType 
     VALUE_PARAMETER name:nc index:0 type:<root>.C? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (nc: <root>.C?): <root>.C declared in <root>'
-        CALL 'public final fun foo (): <root>.C declared in <root>.C' type=<root>.C origin=null
+      RETURN type=kotlin.Nothing from='public final fun test (nc: <root>.C?): IrErrorType declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Unresolved name: foo>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/classReference.fir.txt b/compiler/testData/ir/irText/expressions/classReference.fir.txt
index 21052a9e2e2..5a0e30cf4bc 100644
--- a/compiler/testData/ir/irText/expressions/classReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/classReference.fir.txt
@@ -20,9 +20,10 @@ FILE fqName:<root> fileName:/classReference.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      GET_CLASS type=IrErrorType
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
-      GET_CLASS type=IrErrorType
+      GET_CLASS type=kotlin.reflect.KClass<<root>.A>
+        ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
+      GET_CLASS type=kotlin.reflect.KClass<<root>.A>
         CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.A' type=<root>.A origin=null
-      ERROR_CALL 'Unresolved reference: <Unresolved name: java>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Unresolved name: java>#' type=IrErrorType
+      ERROR_CALL 'No getter found for R|kotlin/jvm/java|' type=java.lang.Class<T of <uninitialized parent>>
+      ERROR_CALL 'No getter found for R|kotlin/jvm/java|' type=java.lang.Class<T of <uninitialized parent>>
+
diff --git a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
index 1d96d9225f5..293bdffe0fd 100644
--- a/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
+++ b/compiler/testData/ir/irText/expressions/coercionToUnit.fir.txt
@@ -1,26 +1,26 @@
 FILE fqName:<root> fileName:/coercionToUnit.kt
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0<kotlin.Unit> visibility:public [final,static] 
       EXPRESSION_BODY
-        BLOCK type=kotlin.Function0 origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function0 
+        BLOCK type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function0<kotlin.Unit> 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Function0 declared in <root>.test1'
-                CONST Int type=kotlin.Function0 value=42
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function0 declared in <root>.test1' type=kotlin.Function0 origin=LAMBDA
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function0 
+              CONST Int type=kotlin.Function0<kotlin.Unit> value=42
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function0<kotlin.Unit> declared in <root>.test1' type=kotlin.Function0<kotlin.Unit> origin=LAMBDA
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Function0<kotlin.Unit> 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function0 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0 visibility:public [final,static] ' type=kotlin.Function0 origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Function0<kotlin.Unit> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Function0<kotlin.Unit> visibility:public [final,static] ' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:test2 visibility:public modality:FINAL <> (mc:kotlin.collections.MutableCollection<kotlin.String>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:mc index:0 type:kotlin.collections.MutableCollection<kotlin.String> 
     BLOCK_BODY
-      CALL 'public abstract fun add (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.MutableCollection' type=kotlin.Boolean origin=null
+      CALL 'public abstract fun add (element: kotlin.String): kotlin.Boolean declared in kotlin.collections.MutableCollection' type=kotlin.Boolean origin=null
         element: CONST String type=kotlin.String value=""
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-        CONST String type=kotlin.String value="Hello,"
-      ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-        CONST String type=kotlin.String value="world!"
+      CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+        x: CONST String type=kotlin.String value="Hello,"
+      CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+        x: CONST String type=kotlin.String value="world!"
+
diff --git a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
index 12be227510b..fb52625e99d 100644
--- a/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
+++ b/compiler/testData/ir/irText/expressions/complexAugmentedAssignment.fir.txt
@@ -131,23 +131,25 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
             GET_VAR 'var i: kotlin.Int [var] declared in <root>.test1' type=kotlin.Int origin=null
           ERROR_CALL 'Unresolved reference: R|<local>/i|' type=IrErrorType
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test1' type=kotlin.Int origin=null
-        value: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-          GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test1' type=kotlin.Int origin=null
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test1' type=kotlin.Int origin=null
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:<unary> type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: x1>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Unresolved name: x1>#' type=IrErrorType
-      GET_VAR 'val <unary>: IrErrorType [val] declared in <root>.test2' type=IrErrorType origin=null
-      VAR name:<unary> type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: x2>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Unresolved name: x2>#' type=IrErrorType
-      GET_VAR 'val <unary>: IrErrorType [val] declared in <root>.test2' type=IrErrorType origin=null
-      VAR name:<unary> type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: x3>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Unresolved name: x3>#' type=IrErrorType
-      GET_VAR 'val <unary>: IrErrorType [val] declared in <root>.test2' type=IrErrorType origin=null
+      VAR name:<unary> type:kotlin.Int [val] 
+        CALL 'public final fun <get-x1> (): kotlin.Int declared in <root>.X1' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x1 type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+      GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
+      VAR name:<unary> type:kotlin.Int [val] 
+        CALL 'public final fun <get-x2> (): kotlin.Int declared in <root>.X1.X2' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x2 type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+      GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
+      VAR name:<unary> type:kotlin.Int [val] 
+        CALL 'public final fun <get-x3> (): kotlin.Int declared in <root>.X1.X2.X3' type=kotlin.Int origin=null
+      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x3 type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+      GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test2' type=kotlin.Int origin=null
   CLASS CLASS name:B modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.B 
     CONSTRUCTOR visibility:public <> (s:kotlin.Int) returnType:<root>.B [primary] 
@@ -218,3 +220,4 @@ FILE fqName:<root> fileName:/complexAugmentedAssignment.kt
     VALUE_PARAMETER name:v index:0 type:<root>.B 
     BLOCK_BODY
       ERROR_CALL 'Unresolved reference: R|<local>/v|' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
index c3d638267e8..7dd1f02aa3d 100644
--- a/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/constructorWithOwnTypeParametersCall.fir.txt
@@ -1,8 +1,8 @@
 FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
-  FUN name:testKotlin visibility:public modality:FINAL <> () returnType:IrErrorType
+  FUN name:testKotlin visibility:public modality:FINAL <> () returnType:<root>.K1.K2<kotlin.String>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testKotlin (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: K2>#' type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun testKotlin (): <root>.K1.K2<kotlin.String> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.K1.K2' type=<root>.K1.K2<kotlin.String> origin=null
   FUN name:testJava visibility:public modality:FINAL <> () returnType:IrErrorType
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testJava (): IrErrorType declared in <root>'
@@ -10,14 +10,14 @@ FILE fqName:<root> fileName:/constructorWithOwnTypeParametersCall.kt
   CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1
     TYPE_PARAMETER name:T1 index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.K1<T1 of <root>.K1> [primary]
+    CONSTRUCTOR visibility:public <> () returnType:<root>.K1<T1 of <uninitialized parent>> [primary]
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K1 modality:FINAL visibility:public superTypes:[kotlin.Any]'
     CLASS CLASS name:K2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.K1.K2
       TYPE_PARAMETER name:T2 index:0 variance: superTypes:[]
-      CONSTRUCTOR visibility:public <> () returnType:<root>.K1.K2<T2 of <root>.K1.K2> [primary]
+      CONSTRUCTOR visibility:public <> () returnType:<root>.K1.K2<T2 of <uninitialized parent>> [primary]
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:K2 modality:FINAL visibility:public [inner] superTypes:[kotlin.Any]'
diff --git a/compiler/testData/ir/irText/expressions/conventionComparisons.fir.txt b/compiler/testData/ir/irText/expressions/conventionComparisons.fir.txt
index eb290cceb53..1bed160ef95 100644
--- a/compiler/testData/ir/irText/expressions/conventionComparisons.fir.txt
+++ b/compiler/testData/ir/irText/expressions/conventionComparisons.fir.txt
@@ -56,3 +56,4 @@ FILE fqName:<root> fileName:/conventionComparisons.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (a1: <root>.IA, a2: <root>.IA): kotlin.Boolean declared in <root>'
         ERROR_CALL 'Comparison of arguments with unsupported type: /IA' type=kotlin.Boolean
+
diff --git a/compiler/testData/ir/irText/expressions/destructuring1.fir.txt b/compiler/testData/ir/irText/expressions/destructuring1.fir.txt
index 5bf5e317c63..7a02f995117 100644
--- a/compiler/testData/ir/irText/expressions/destructuring1.fir.txt
+++ b/compiler/testData/ir/irText/expressions/destructuring1.fir.txt
@@ -49,9 +49,10 @@ FILE fqName:<root> fileName:/destructuring1.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:<destruct> type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
+      VAR name:<destruct> type:<root>.A [val] 
+        ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
       VAR name:x type:kotlin.Int [val] 
         CALL 'public final fun component1 (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=null
       VAR name:y type:kotlin.Int [val] 
         CALL 'public final fun component2 (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.fir.txt b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.fir.txt
index e020119c58d..1edf7edce95 100644
--- a/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.fir.txt
+++ b/compiler/testData/ir/irText/expressions/destructuringWithUnderscore.fir.txt
@@ -54,11 +54,12 @@ FILE fqName:<root> fileName:/destructuringWithUnderscore.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:<destruct> type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
+      VAR name:<destruct> type:<root>.A [val] 
+        ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
       VAR name:x type:kotlin.Int [val] 
         CALL 'public final fun component1 (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=null
       VAR name:_ type:kotlin.Int [val] 
         CALL 'public final fun component2 (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=null
       VAR name:z type:kotlin.Int [val] 
         CALL 'public final fun component3 (): kotlin.Int declared in <root>.B' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/dotQualified.fir.txt b/compiler/testData/ir/irText/expressions/dotQualified.fir.txt
index bacdb32815a..bfafe09d080 100644
--- a/compiler/testData/ir/irText/expressions/dotQualified.fir.txt
+++ b/compiler/testData/ir/irText/expressions/dotQualified.fir.txt
@@ -1,11 +1,12 @@
 FILE fqName:<root> fileName:/dotQualified.kt
-  FUN name:length visibility:public modality:FINAL <> (s:kotlin.String) returnType:IrErrorType 
+  FUN name:length visibility:public modality:FINAL <> (s:kotlin.String) returnType:kotlin.Int 
     VALUE_PARAMETER name:s index:0 type:kotlin.String 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun length (s: kotlin.String): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-  FUN name:lengthN visibility:public modality:FINAL <> (s:kotlin.String?) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun length (s: kotlin.String): kotlin.Int declared in <root>'
+        ERROR_CALL 'No getter found for R|kotlin/String.length|' type=kotlin.Int
+  FUN name:lengthN visibility:public modality:FINAL <> (s:kotlin.String?) returnType:kotlin.Int 
     VALUE_PARAMETER name:s index:0 type:kotlin.String? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun lengthN (s: kotlin.String?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun lengthN (s: kotlin.String?): kotlin.Int declared in <root>'
+        ERROR_CALL 'No getter found for R|kotlin/String.length|' type=kotlin.Int
+
diff --git a/compiler/testData/ir/irText/expressions/elvis.fir.txt b/compiler/testData/ir/irText/expressions/elvis.fir.txt
index 8b45297b678..ad5b94aad96 100644
--- a/compiler/testData/ir/irText/expressions/elvis.fir.txt
+++ b/compiler/testData/ir/irText/expressions/elvis.fir.txt
@@ -12,15 +12,15 @@ FILE fqName:<root> fileName:/elvis.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Any? declared in <root>'
         CONST Null type=kotlin.Nothing? value=null
-  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Any?, b:kotlin.Any) returnType:kotlin.Any 
+  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Any?, b:kotlin.Any) returnType:kotlin.Any? 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any? 
     VALUE_PARAMETER name:b index:1 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Any?, b: kotlin.Any): kotlin.Any declared in <root>'
-        BLOCK type=kotlin.Any origin=ELVIS
+      RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Any?, b: kotlin.Any): kotlin.Any? declared in <root>'
+        BLOCK type=kotlin.Any? origin=ELVIS
           VAR name:<elvis> type:kotlin.Any? [val] 
             GET_VAR 'a: kotlin.Any? declared in <root>.test1' type=kotlin.Any? origin=null
-          WHEN type=kotlin.Any origin=ELVIS
+          WHEN type=kotlin.Any? origin=ELVIS
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test1' type=kotlin.Any? origin=null
@@ -29,15 +29,15 @@ FILE fqName:<root> fileName:/elvis.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test1' type=kotlin.Any? origin=null
-  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.String?, b:kotlin.Any) returnType:kotlin.Any 
+  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.String?, b:kotlin.Any) returnType:kotlin.Any? 
     VALUE_PARAMETER name:a index:0 type:kotlin.String? 
     VALUE_PARAMETER name:b index:1 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.String?, b: kotlin.Any): kotlin.Any declared in <root>'
-        BLOCK type=kotlin.Any origin=ELVIS
+      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.String?, b: kotlin.Any): kotlin.Any? declared in <root>'
+        BLOCK type=kotlin.Any? origin=ELVIS
           VAR name:<elvis> type:kotlin.String? [val] 
             GET_VAR 'a: kotlin.String? declared in <root>.test2' type=kotlin.String? origin=null
-          WHEN type=kotlin.Any origin=ELVIS
+          WHEN type=kotlin.Any? origin=ELVIS
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val <elvis>: kotlin.String? [val] declared in <root>.test2' type=kotlin.String? origin=null
@@ -75,14 +75,14 @@ FILE fqName:<root> fileName:/elvis.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test3' type=kotlin.Any? origin=null
-  FUN name:test4 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any 
+  FUN name:test4 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any? 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4 (x: kotlin.Any): kotlin.Any declared in <root>'
-        BLOCK type=kotlin.Any origin=ELVIS
+      RETURN type=kotlin.Nothing from='public final fun test4 (x: kotlin.Any): kotlin.Any? declared in <root>'
+        BLOCK type=kotlin.Any? origin=ELVIS
           VAR name:<elvis> type:kotlin.Any? [val] 
             CALL 'public final fun <get-p> (): kotlin.Any? declared in <root>' type=kotlin.Any? origin=null
-          WHEN type=kotlin.Any origin=ELVIS
+          WHEN type=kotlin.Any? origin=ELVIS
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test4' type=kotlin.Any? origin=null
@@ -91,14 +91,14 @@ FILE fqName:<root> fileName:/elvis.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test4' type=kotlin.Any? origin=null
-  FUN name:test5 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any 
+  FUN name:test5 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Any? 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test5 (x: kotlin.Any): kotlin.Any declared in <root>'
-        BLOCK type=kotlin.Any origin=ELVIS
+      RETURN type=kotlin.Nothing from='public final fun test5 (x: kotlin.Any): kotlin.Any? declared in <root>'
+        BLOCK type=kotlin.Any? origin=ELVIS
           VAR name:<elvis> type:kotlin.Any? [val] 
             CALL 'public final fun foo (): kotlin.Any? declared in <root>' type=kotlin.Any? origin=null
-          WHEN type=kotlin.Any origin=ELVIS
+          WHEN type=kotlin.Any? origin=ELVIS
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test5' type=kotlin.Any? origin=null
@@ -107,3 +107,4 @@ FILE fqName:<root> fileName:/elvis.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val <elvis>: kotlin.Any? [val] declared in <root>.test5' type=kotlin.Any? origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt
index 6c3fa8a01ce..4d07efe96b2 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryAsReceiver.fir.txt
@@ -29,8 +29,7 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($this:<root>.X.B) returnType:IrErrorType 
                 $this: VALUE_PARAMETER name:<this> type:<root>.X.B 
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.X.B.value'
-                    CALL 'public final fun <get-value2> (): kotlin.String declared in <root>.X.B' type=kotlin.String origin=null
+                  CALL 'public final fun <get-value2> (): kotlin.String declared in <root>.X.B' type=kotlin.String origin=null
               FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.X.B.value' type=IrErrorType origin=LAMBDA
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.X.B) returnType:IrErrorType 
           correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val] 
@@ -53,7 +52,7 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
     PROPERTY name:value visibility:public modality:ABSTRACT [val] 
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:ABSTRACT <> ($this:<root>.X) returnType:kotlin.Function0 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:ABSTRACT <> ($this:<root>.X) returnType:kotlin.Function0<kotlin.String> 
         correspondingProperty: PROPERTY name:value visibility:public modality:ABSTRACT [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.X 
     FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any 
@@ -82,3 +81,4 @@ FILE fqName:<root> fileName:/enumEntryAsReceiver.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: value>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt
index dca822029e6..9f06890f086 100644
--- a/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt
+++ b/compiler/testData/ir/irText/expressions/enumEntryReferenceFromEnumEntryClass.fir.txt
@@ -46,11 +46,9 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
               FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:IrErrorType 
                 $this: VALUE_PARAMETER name:<this> type:<root>.MyEnum.Z 
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.MyEnum.Z.aLambda'
-                    BLOCK type=kotlin.Unit origin=null
-                      SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
-                        value: CONST Int type=kotlin.Int value=1
-                      CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
+                  SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
+                    value: CONST Int type=kotlin.Int value=1
+                  CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
               FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.MyEnum.Z.aLambda' type=IrErrorType origin=LAMBDA
         FUN DEFAULT_PROPERTY_ACCESSOR name:<get-aLambda> visibility:public modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:IrErrorType 
           correspondingProperty: PROPERTY name:aLambda visibility:public modality:FINAL [val] 
@@ -60,12 +58,12 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
               GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aLambda type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
                 receiver: GET_VAR '<this>: <root>.MyEnum.Z declared in <root>.MyEnum.Z.<get-aLambda>' type=<root>.MyEnum.Z origin=null
       PROPERTY name:anObject visibility:public modality:FINAL [val] 
-        FIELD PROPERTY_BACKING_FIELD name:anObject type:IrErrorType visibility:public [final] 
+        FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final] 
           EXPRESSION_BODY
             BLOCK type=<root>.MyEnum.Z.anObject.<no name provided> origin=OBJECT_LITERAL
               CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
                 $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.MyEnum.Z.anObject.<no name provided> 
-                CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+                CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
                   BLOCK_BODY
                     DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                     INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
@@ -81,12 +79,12 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
                       value: CONST Int type=kotlin.Int value=1
                     CALL 'public final fun foo (): kotlin.Unit declared in <root>.MyEnum.Z' type=kotlin.Unit origin=null
               CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.MyEnum.Z.anObject.<no name provided>' type=<root>.MyEnum.Z.anObject.<no name provided> origin=null
-        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-anObject> visibility:public modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:IrErrorType 
+        FUN DEFAULT_PROPERTY_ACCESSOR name:<get-anObject> visibility:public modality:FINAL <> ($this:<root>.MyEnum.Z) returnType:kotlin.Any 
           correspondingProperty: PROPERTY name:anObject visibility:public modality:FINAL [val] 
           $this: VALUE_PARAMETER name:<this> type:<root>.MyEnum.Z 
           BLOCK_BODY
-            RETURN type=kotlin.Nothing from='public final fun <get-anObject> (): IrErrorType declared in <root>.MyEnum.Z'
-              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
+            RETURN type=kotlin.Nothing from='public final fun <get-anObject> (): kotlin.Any declared in <root>.MyEnum.Z'
+              GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final] ' type=kotlin.Any origin=null
                 receiver: GET_VAR '<this>: <root>.MyEnum.Z declared in <root>.MyEnum.Z.<get-anObject>' type=<root>.MyEnum.Z origin=null
       FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
         overridden:
@@ -123,3 +121,4 @@ FILE fqName:<root> fileName:/enumEntryReferenceFromEnumEntryClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.fir.txt b/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.fir.txt
index 291a2f7dcb4..ffce7b670b9 100644
--- a/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.fir.txt
+++ b/compiler/testData/ir/irText/expressions/extFunInvokeAsFun.fir.txt
@@ -1,14 +1,15 @@
 FILE fqName:<root> fileName:/extFunInvokeAsFun.kt
-  FUN name:with1 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:kotlin.Function1) returnType:IrErrorType 
+  FUN name:with1 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:kotlin.Function1<kotlin.Any?, kotlin.Unit>) returnType:IrErrorType 
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any? 
-    VALUE_PARAMETER name:block index:1 type:kotlin.Function1 
+    VALUE_PARAMETER name:block index:1 type:kotlin.Function1<kotlin.Any?, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun with1 (receiver: kotlin.Any?, block: kotlin.Function1): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun with1 (receiver: kotlin.Any?, block: kotlin.Function1<kotlin.Any?, kotlin.Unit>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: block>#' type=IrErrorType
           GET_VAR 'receiver: kotlin.Any? declared in <root>.with1' type=kotlin.Any? origin=null
-  FUN name:with2 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:kotlin.Function1) returnType:IrErrorType 
+  FUN name:with2 visibility:public modality:FINAL <> (receiver:kotlin.Any?, block:kotlin.Function1<kotlin.Any?, kotlin.Unit>) returnType:IrErrorType 
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any? 
-    VALUE_PARAMETER name:block index:1 type:kotlin.Function1 
+    VALUE_PARAMETER name:block index:1 type:kotlin.Function1<kotlin.Any?, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun with2 (receiver: kotlin.Any?, block: kotlin.Function1): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun with2 (receiver: kotlin.Any?, block: kotlin.Function1<kotlin.Any?, kotlin.Unit>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: block>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/extFunSafeInvoke.fir.txt b/compiler/testData/ir/irText/expressions/extFunSafeInvoke.fir.txt
index 634c398a852..a9210438baa 100644
--- a/compiler/testData/ir/irText/expressions/extFunSafeInvoke.fir.txt
+++ b/compiler/testData/ir/irText/expressions/extFunSafeInvoke.fir.txt
@@ -1,9 +1,10 @@
 FILE fqName:<root> fileName:/extFunSafeInvoke.kt
-  FUN name:test visibility:public modality:FINAL <> (receiver:kotlin.Any?, fn:kotlin.Function3) returnType:IrErrorType 
+  FUN name:test visibility:public modality:FINAL <> (receiver:kotlin.Any?, fn:kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit>) returnType:IrErrorType 
     VALUE_PARAMETER name:receiver index:0 type:kotlin.Any? 
-    VALUE_PARAMETER name:fn index:1 type:kotlin.Function3 
+    VALUE_PARAMETER name:fn index:1 type:kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (receiver: kotlin.Any?, fn: kotlin.Function3): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test (receiver: kotlin.Any?, fn: kotlin.Function3<kotlin.Any, kotlin.Int, kotlin.String, kotlin.Unit>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: fn>#' type=IrErrorType
           CONST Int type=kotlin.Int value=42
           CONST String type=kotlin.String value="Hello"
+
diff --git a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt
index 8898fc7203b..f6dcebf6ac9 100644
--- a/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/extensionPropertyGetterCall.fir.txt
@@ -5,7 +5,8 @@ FILE fqName:<root> fileName:/extensionPropertyGetterCall.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-okext> (): kotlin.String declared in <root>'
           CONST String type=kotlin.String value="OK"
-  FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.String 
+  FUN name:test5 visibility:public modality:FINAL <> () returnType:IrErrorType 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test5 (): kotlin.String declared in <root>'
-        CALL 'public final fun <get-okext> (): kotlin.String declared in <root>' type=kotlin.String origin=null
+      RETURN type=kotlin.Nothing from='public final fun test5 (): IrErrorType declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Unresolved name: okext>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/field.fir.txt b/compiler/testData/ir/irText/expressions/field.fir.txt
index 1b2e7f04da8..e805887df39 100644
--- a/compiler/testData/ir/irText/expressions/field.fir.txt
+++ b/compiler/testData/ir/irText/expressions/field.fir.txt
@@ -27,3 +27,4 @@ FILE fqName:<root> fileName:/field.kt
       VALUE_PARAMETER name:value index:0 type:kotlin.Int 
       BLOCK_BODY
         ERROR_CALL 'Unresolved reference: <Unresolved name: field>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.fir.txt
index 822ad179494..79f11171005 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/comparableWithDoubleOrFloat.fir.txt
@@ -39,3 +39,4 @@ FILE fqName:<root> fileName:/comparableWithDoubleOrFloat.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.fir.txt
index 12f32e9f0bd..3d5449df675 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/eqeqRhsConditionPossiblyAffectingLhs.fir.txt
@@ -5,14 +5,14 @@ FILE fqName:<root> fileName:/eqeqRhsConditionPossiblyAffectingLhs.kt
       RETURN type=kotlin.Nothing from='public final fun test (x: kotlin.Any): kotlin.Boolean declared in <root>'
         CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
           arg0: GET_VAR 'x: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
-          arg1: WHEN type=kotlin.Nothing origin=IF
+          arg1: WHEN type=kotlin.Any? origin=IF
             BRANCH
               if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Double
                 GET_VAR 'x: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
-              then: BLOCK type=kotlin.Nothing origin=EXCLEXCL
+              then: BLOCK type=kotlin.Nothing? origin=EXCLEXCL
                 VAR name:<bangbang> type:kotlin.Nothing? [val] 
                   CONST Null type=kotlin.Nothing? value=null
-                WHEN type=kotlin.Nothing origin=EXCLEXCL
+                WHEN type=kotlin.Nothing? origin=EXCLEXCL
                   BRANCH
                     if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                       arg0: GET_VAR 'val <bangbang>: kotlin.Nothing? [val] declared in <root>.test' type=kotlin.Nothing? origin=null
@@ -25,3 +25,4 @@ FILE fqName:<root> fileName:/eqeqRhsConditionPossiblyAffectingLhs.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'x: kotlin.Any declared in <root>.test' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.fir.txt
index 817b8ede0c3..60af8ea530f 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointCompareTo.fir.txt
@@ -1,11 +1,11 @@
 FILE fqName:<root> fileName:/floatingPointCompareTo.kt
-  FUN name:test1d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Double) returnType:IrErrorType 
+  FUN name:test1d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Double) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Double 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1d (x: kotlin.Double, y: kotlin.Double): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Double declared in <root>.test1d' type=kotlin.Double origin=null
+      RETURN type=kotlin.Nothing from='public final fun test1d (x: kotlin.Double, y: kotlin.Double): kotlin.Int declared in <root>'
+        CALL 'public open fun compareTo (other: kotlin.Double): kotlin.Int declared in kotlin.Double' type=kotlin.Int origin=null
+          other: GET_VAR 'y: kotlin.Double declared in <root>.test1d' type=kotlin.Double origin=null
   FUN name:test2d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any 
@@ -16,7 +16,7 @@ FILE fqName:<root> fileName:/floatingPointCompareTo.kt
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Double
               GET_VAR 'y: kotlin.Any declared in <root>.test2d' type=kotlin.Any origin=null
             then: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo]>#' type=IrErrorType
+              arg0: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo, kotlin/Double.compareTo]>#' type=IrErrorType
                 GET_VAR 'y: kotlin.Any declared in <root>.test2d' type=kotlin.Any origin=null
               arg1: CONST Int type=kotlin.Boolean value=0
           BRANCH
@@ -45,13 +45,13 @@ FILE fqName:<root> fileName:/floatingPointCompareTo.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
-  FUN name:test1f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Float) returnType:IrErrorType 
+  FUN name:test1f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Float) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Float 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1f (x: kotlin.Float, y: kotlin.Float): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Float declared in <root>.test1f' type=kotlin.Float origin=null
+      RETURN type=kotlin.Nothing from='public final fun test1f (x: kotlin.Float, y: kotlin.Float): kotlin.Int declared in <root>'
+        CALL 'public open fun compareTo (other: kotlin.Float): kotlin.Int declared in kotlin.Float' type=kotlin.Int origin=null
+          other: GET_VAR 'y: kotlin.Float declared in <root>.test1f' type=kotlin.Float origin=null
   FUN name:test2f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any 
@@ -62,7 +62,7 @@ FILE fqName:<root> fileName:/floatingPointCompareTo.kt
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Float
               GET_VAR 'y: kotlin.Any declared in <root>.test2f' type=kotlin.Any origin=null
             then: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
+              arg0: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
                 GET_VAR 'y: kotlin.Any declared in <root>.test2f' type=kotlin.Any origin=null
               arg1: CONST Int type=kotlin.Boolean value=0
           BRANCH
@@ -137,12 +137,12 @@ FILE fqName:<root> fileName:/floatingPointCompareTo.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
-  FUN name:test1fr visibility:public modality:FINAL <> (x:kotlin.Float) returnType:IrErrorType 
+  FUN name:test1fr visibility:public modality:FINAL <> (x:kotlin.Float) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1fr (x: kotlin.Float): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Float declared in <root>.test1fr' type=kotlin.Float origin=null
+      RETURN type=kotlin.Nothing from='public final fun test1fr (x: kotlin.Float): kotlin.Int declared in <root>'
+        CALL 'public open fun compareTo (other: kotlin.Float): kotlin.Int declared in kotlin.Float' type=kotlin.Int origin=null
+          other: GET_VAR 'x: kotlin.Float declared in <root>.test1fr' type=kotlin.Float origin=null
   FUN name:test2fr visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -152,7 +152,7 @@ FILE fqName:<root> fileName:/floatingPointCompareTo.kt
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Float
               GET_VAR 'x: kotlin.Any declared in <root>.test2fr' type=kotlin.Any origin=null
             then: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
+              arg0: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
                 GET_VAR 'x: kotlin.Any declared in <root>.test2fr' type=kotlin.Any origin=null
               arg1: CONST Int type=kotlin.Boolean value=0
           BRANCH
@@ -167,9 +167,10 @@ FILE fqName:<root> fileName:/floatingPointCompareTo.kt
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Double
               GET_VAR 'x: kotlin.Any declared in <root>.test3fr' type=kotlin.Any origin=null
             then: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Ambiguity: compareTo, [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
+              arg0: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo, kotlin/Float.compareTo]>#' type=IrErrorType
                 GET_VAR 'x: kotlin.Any declared in <root>.test3fr' type=kotlin.Any origin=null
               arg1: CONST Int type=kotlin.Boolean value=0
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.fir.txt
index e0b6a250627..2b3df76a9f6 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEqeq.fir.txt
@@ -181,3 +181,4 @@ FILE fqName:<root> fileName:/floatingPointEqeq.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.fir.txt
index 4c2de61dfd7..644047bf14f 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointEquals.fir.txt
@@ -1,32 +1,32 @@
 FILE fqName:<root> fileName:/floatingPointEquals.kt
-  FUN name:test1d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Double) returnType:IrErrorType 
+  FUN name:test1d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Double) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Double 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1d (x: kotlin.Double, y: kotlin.Double): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Double declared in <root>.test1d' type=kotlin.Double origin=null
-  FUN name:test2d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Double?) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1d (x: kotlin.Double, y: kotlin.Double): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Double declared in <root>.test1d' type=kotlin.Double origin=null
+  FUN name:test2d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Double?) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Double? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2d (x: kotlin.Double, y: kotlin.Double?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Double? declared in <root>.test2d' type=kotlin.Double? origin=null
-  FUN name:test3d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Any) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test2d (x: kotlin.Double, y: kotlin.Double?): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Double? declared in <root>.test2d' type=kotlin.Double? origin=null
+  FUN name:test3d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3d (x: kotlin.Double, y: kotlin.Any): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Any declared in <root>.test3d' type=kotlin.Any origin=null
-  FUN name:test4d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Number) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test3d (x: kotlin.Double, y: kotlin.Any): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Any declared in <root>.test3d' type=kotlin.Any origin=null
+  FUN name:test4d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Number) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Number 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4d (x: kotlin.Double, y: kotlin.Number): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Number declared in <root>.test4d' type=kotlin.Number origin=null
+      RETURN type=kotlin.Nothing from='public final fun test4d (x: kotlin.Double, y: kotlin.Number): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Number declared in <root>.test4d' type=kotlin.Number origin=null
   FUN name:test5d visibility:public modality:FINAL <> (x:kotlin.Double, y:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Double 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any 
@@ -36,8 +36,8 @@ FILE fqName:<root> fileName:/floatingPointEquals.kt
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Double
               GET_VAR 'y: kotlin.Any declared in <root>.test5d' type=kotlin.Any origin=null
-            then: ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-              GET_VAR 'y: kotlin.Any declared in <root>.test5d' type=kotlin.Any origin=null
+            then: CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+              other: GET_VAR 'y: kotlin.Any declared in <root>.test5d' type=kotlin.Any origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
@@ -62,34 +62,34 @@ FILE fqName:<root> fileName:/floatingPointEquals.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
-  FUN name:test1f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Float) returnType:IrErrorType 
+  FUN name:test1f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Float) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Float 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1f (x: kotlin.Float, y: kotlin.Float): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Float declared in <root>.test1f' type=kotlin.Float origin=null
-  FUN name:test2f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Float?) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1f (x: kotlin.Float, y: kotlin.Float): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Float declared in <root>.test1f' type=kotlin.Float origin=null
+  FUN name:test2f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Float?) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Float? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2f (x: kotlin.Float, y: kotlin.Float?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Float? declared in <root>.test2f' type=kotlin.Float? origin=null
-  FUN name:test3f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Any) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test2f (x: kotlin.Float, y: kotlin.Float?): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Float? declared in <root>.test2f' type=kotlin.Float? origin=null
+  FUN name:test3f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3f (x: kotlin.Float, y: kotlin.Any): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Any declared in <root>.test3f' type=kotlin.Any origin=null
-  FUN name:test4f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Number) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test3f (x: kotlin.Float, y: kotlin.Any): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Any declared in <root>.test3f' type=kotlin.Any origin=null
+  FUN name:test4f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Number) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Number 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4f (x: kotlin.Float, y: kotlin.Number): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'y: kotlin.Number declared in <root>.test4f' type=kotlin.Number origin=null
+      RETURN type=kotlin.Nothing from='public final fun test4f (x: kotlin.Float, y: kotlin.Number): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'y: kotlin.Number declared in <root>.test4f' type=kotlin.Number origin=null
   FUN name:test5f visibility:public modality:FINAL <> (x:kotlin.Float, y:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any 
@@ -99,8 +99,8 @@ FILE fqName:<root> fileName:/floatingPointEquals.kt
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Float
               GET_VAR 'y: kotlin.Any declared in <root>.test5f' type=kotlin.Any origin=null
-            then: ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-              GET_VAR 'y: kotlin.Any declared in <root>.test5f' type=kotlin.Any origin=null
+            then: CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+              other: GET_VAR 'y: kotlin.Any declared in <root>.test5f' type=kotlin.Any origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
@@ -167,30 +167,30 @@ FILE fqName:<root> fileName:/floatingPointEquals.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
-  FUN name:test1fr visibility:public modality:FINAL <> (x:kotlin.Float) returnType:IrErrorType 
+  FUN name:test1fr visibility:public modality:FINAL <> (x:kotlin.Float) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1fr (x: kotlin.Float): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Float declared in <root>.test1fr' type=kotlin.Float origin=null
-  FUN name:test2fr visibility:public modality:FINAL <> (x:kotlin.Float?) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1fr (x: kotlin.Float): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'x: kotlin.Float declared in <root>.test1fr' type=kotlin.Float origin=null
+  FUN name:test2fr visibility:public modality:FINAL <> (x:kotlin.Float?) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Float? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2fr (x: kotlin.Float?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Float? declared in <root>.test2fr' type=kotlin.Float? origin=null
-  FUN name:test3fr visibility:public modality:FINAL <> (x:kotlin.Any) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test2fr (x: kotlin.Float?): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'x: kotlin.Float? declared in <root>.test2fr' type=kotlin.Float? origin=null
+  FUN name:test3fr visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3fr (x: kotlin.Any): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Any declared in <root>.test3fr' type=kotlin.Any origin=null
-  FUN name:test4fr visibility:public modality:FINAL <> (x:kotlin.Number) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test3fr (x: kotlin.Any): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'x: kotlin.Any declared in <root>.test3fr' type=kotlin.Any origin=null
+  FUN name:test4fr visibility:public modality:FINAL <> (x:kotlin.Number) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Number 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4fr (x: kotlin.Number): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Number declared in <root>.test4fr' type=kotlin.Number origin=null
+      RETURN type=kotlin.Nothing from='public final fun test4fr (x: kotlin.Number): kotlin.Boolean declared in <root>'
+        CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+          other: GET_VAR 'x: kotlin.Number declared in <root>.test4fr' type=kotlin.Number origin=null
   FUN name:test5fr visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -199,8 +199,8 @@ FILE fqName:<root> fileName:/floatingPointEquals.kt
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Float
               GET_VAR 'x: kotlin.Any declared in <root>.test5fr' type=kotlin.Any origin=null
-            then: ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-              GET_VAR 'x: kotlin.Any declared in <root>.test5fr' type=kotlin.Any origin=null
+            then: CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+              other: GET_VAR 'x: kotlin.Any declared in <root>.test5fr' type=kotlin.Any origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
@@ -212,8 +212,9 @@ FILE fqName:<root> fileName:/floatingPointEquals.kt
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Double
               GET_VAR 'x: kotlin.Any declared in <root>.test6fr' type=kotlin.Any origin=null
-            then: ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
-              GET_VAR 'x: kotlin.Any declared in <root>.test6fr' type=kotlin.Any origin=null
+            then: CALL 'public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any' type=kotlin.Boolean origin=null
+              other: GET_VAR 'x: kotlin.Any declared in <root>.test6fr' type=kotlin.Any origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.fir.txt
index 21dfe0b16b8..e9f18bfb8e1 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointExcleq.fir.txt
@@ -195,3 +195,4 @@ FILE fqName:<root> fileName:/floatingPointExcleq.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.fir.txt
index a84ec9a40b5..3813dd0219d 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/floatingPointLess.fir.txt
@@ -121,3 +121,4 @@ FILE fqName:<root> fileName:/floatingPointLess.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt
index b293061ae74..e483384cee6 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableAnyAsIntToDouble.fir.txt
@@ -12,3 +12,4 @@ FILE fqName:<root> fileName:/nullableAnyAsIntToDouble.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.fir.txt
index b5fb0f7223e..8eabe98164f 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/nullableFloatingPointEqeq.fir.txt
@@ -59,3 +59,4 @@ FILE fqName:<root> fileName:/nullableFloatingPointEqeq.kt
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.fir.txt
index c4da56cac41..c88f419b69d 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/typeParameterWithPrimitiveNumericSupertype.fir.txt
@@ -115,7 +115,7 @@ FILE fqName:<root> fileName:/typeParameterWithPrimitiveNumericSupertype.kt
   CLASS CLASS name:F modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.F 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.F<T of <root>.F> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.F<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:F modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -148,3 +148,4 @@ FILE fqName:<root> fileName:/typeParameterWithPrimitiveNumericSupertype.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.fir.txt b/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.fir.txt
index 1c92e23adc0..c2616667696 100644
--- a/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.fir.txt
+++ b/compiler/testData/ir/irText/expressions/floatingPointComparisons/whenByFloatingPoint.fir.txt
@@ -57,7 +57,7 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: CONST Int type=kotlin.Int value=1
-  FUN name:testSmartCastInWhenConditionInBranch visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Int
+  FUN name:testSmartCastInWhenConditionInBranch visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testSmartCastInWhenConditionInBranch (x: kotlin.Any): kotlin.Int declared in <root>'
@@ -119,8 +119,8 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val tmp5_subject: kotlin.Any [val] declared in <root>.testWithPrematureExitInConditionSubexpression' type=kotlin.Any origin=null
-                arg1: CALL 'public final fun foo (x: kotlin.Double): kotlin.Double declared in <root>' type=kotlin.Double origin=null
-                  x: WHEN type=kotlin.Int origin=IF
+                arg1: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/foo]>#' type=IrErrorType
+                  WHEN type=kotlin.Any origin=IF
                     BRANCH
                       if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Double
                         GET_VAR 'x: kotlin.Any declared in <root>.testWithPrematureExitInConditionSubexpression' type=kotlin.Any origin=null
@@ -133,3 +133,4 @@ FILE fqName:<root> fileName:/whenByFloatingPoint.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: CONST Int type=kotlin.Int value=1
+
diff --git a/compiler/testData/ir/irText/expressions/for.fir.txt b/compiler/testData/ir/irText/expressions/for.fir.txt
index e62c170c675..ae086194801 100644
--- a/compiler/testData/ir/irText/expressions/for.fir.txt
+++ b/compiler/testData/ir/irText/expressions/for.fir.txt
@@ -4,44 +4,45 @@ FILE fqName:<root> fileName:/for.kt
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
         GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testEmpty' type=kotlin.collections.List<kotlin.String> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
       WHILE label=null origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
         body: BLOCK type=kotlin.Unit origin=null
-          VAR name:s type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+          VAR name:s type:kotlin.String [val] 
+            CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
   FUN name:testIterable visibility:public modality:FINAL <> (ss:kotlin.collections.List<kotlin.String>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:ss index:0 type:kotlin.collections.List<kotlin.String> 
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
         GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testIterable' type=kotlin.collections.List<kotlin.String> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
       WHILE label=null origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
-        body: BLOCK type=IrErrorType origin=null
-          VAR name:s type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            GET_VAR 'val s: T of <uninitialized parent> [val] declared in <root>.testIterable' type=T of <uninitialized parent> origin=null
+        body: BLOCK type=kotlin.Unit origin=null
+          VAR name:s type:kotlin.String [val] 
+            CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: GET_VAR 'val s: kotlin.String [val] declared in <root>.testIterable' type=kotlin.String origin=null
   FUN name:testDestructuring visibility:public modality:FINAL <> (pp:kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:pp index:0 type:kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> 
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> [val] 
         GET_VAR 'pp: kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> declared in <root>.testDestructuring' type=kotlin.collections.List<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.Pair<kotlin.Int, kotlin.String>> origin=null
       WHILE label=null origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
-        body: BLOCK type=IrErrorType origin=null
-          VAR name:<destruct> type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
-          VAR name:i type:IrErrorType [val] 
-            ERROR_CALL 'Unresolved reference: <Ambiguity: component1, [kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1, kotlin/collections/component1]>#' type=IrErrorType
-          VAR name:s type:IrErrorType [val] 
-            ERROR_CALL 'Unresolved reference: <Ambiguity: component2, [kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2, kotlin/collections/component2]>#' type=IrErrorType
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            GET_VAR 'val i: IrErrorType [val] declared in <root>.testDestructuring' type=IrErrorType origin=null
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            GET_VAR 'val s: IrErrorType [val] declared in <root>.testDestructuring' type=IrErrorType origin=null
+        body: BLOCK type=kotlin.Unit origin=null
+          VAR name:<destruct> type:kotlin.Pair<kotlin.Int, kotlin.String> [val] 
+            CALL 'public abstract fun next (): kotlin.Pair<kotlin.Int, kotlin.String> declared in kotlin.collections.Iterator' type=kotlin.Pair<kotlin.Int, kotlin.String> origin=null
+          VAR name:i type:kotlin.Int [val] 
+            CALL 'public final fun component1 (): kotlin.Int declared in kotlin.Pair' type=kotlin.Int origin=null
+          VAR name:s type:kotlin.String [val] 
+            CALL 'public final fun component2 (): kotlin.String declared in kotlin.Pair' type=kotlin.String origin=null
+          CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: GET_VAR 'val i: kotlin.Int [val] declared in <root>.testDestructuring' type=kotlin.Int origin=null
+          CALL 'public final fun println (message: kotlin.Any?): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: GET_VAR 'val s: kotlin.String [val] declared in <root>.testDestructuring' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt b/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt
index 7e365ff9552..adc9d788c56 100644
--- a/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt
+++ b/compiler/testData/ir/irText/expressions/forWithBreakContinue.fir.txt
@@ -4,35 +4,35 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
         GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForBreak1' type=kotlin.collections.List<kotlin.String> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
       WHILE label=null origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
         body: BLOCK type=kotlin.Nothing origin=null
-          VAR name:s type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+          VAR name:s type:kotlin.String [val] 
+            CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
           BREAK label=null loop.label=null
   FUN name:testForBreak2 visibility:public modality:FINAL <> (ss:kotlin.collections.List<kotlin.String>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:ss index:0 type:kotlin.collections.List<kotlin.String> 
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
         GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForBreak2' type=kotlin.collections.List<kotlin.String> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
       WHILE label=OUTER origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
         body: BLOCK type=kotlin.Nothing origin=null
-          VAR name:s1 type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+          VAR name:s1 type:kotlin.String [val] 
+            CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
           VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
             GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForBreak2' type=kotlin.collections.List<kotlin.String> origin=null
-          VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-            CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+          VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+            CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
           WHILE label=INNER origin=FOR_LOOP_INNER_WHILE
             condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
             body: BLOCK type=kotlin.Nothing origin=null
-              VAR name:s2 type:T of <uninitialized parent> [val] 
-                CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+              VAR name:s2 type:kotlin.String [val] 
+                CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
               BREAK label=OUTER loop.label=OUTER
               BREAK label=INNER loop.label=INNER
               BREAK label=null loop.label=INNER
@@ -42,36 +42,37 @@ FILE fqName:<root> fileName:/forWithBreakContinue.kt
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
         GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForContinue1' type=kotlin.collections.List<kotlin.String> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
       WHILE label=null origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
         body: BLOCK type=kotlin.Nothing origin=null
-          VAR name:s type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+          VAR name:s type:kotlin.String [val] 
+            CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
           CONTINUE label=null loop.label=null
   FUN name:testForContinue2 visibility:public modality:FINAL <> (ss:kotlin.collections.List<kotlin.String>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:ss index:0 type:kotlin.collections.List<kotlin.String> 
     BLOCK_BODY
       VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
         GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForContinue2' type=kotlin.collections.List<kotlin.String> origin=null
-      VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+      VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+        CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
       WHILE label=OUTER origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
         body: BLOCK type=kotlin.Nothing origin=null
-          VAR name:s1 type:T of <uninitialized parent> [val] 
-            CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+          VAR name:s1 type:kotlin.String [val] 
+            CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
           VAR name:<range> type:kotlin.collections.List<kotlin.String> [val] 
             GET_VAR 'ss: kotlin.collections.List<kotlin.String> declared in <root>.testForContinue2' type=kotlin.collections.List<kotlin.String> origin=null
-          VAR name:<iterator> type:kotlin.collections.Iterator<E of <uninitialized parent>> [val] 
-            CALL 'public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in kotlin.collections.List' type=kotlin.collections.Iterator<E of <uninitialized parent>> origin=null
+          VAR name:<iterator> type:kotlin.collections.Iterator<kotlin.String> [val] 
+            CALL 'public abstract fun iterator (): kotlin.collections.Iterator<kotlin.String> declared in kotlin.collections.List' type=kotlin.collections.Iterator<kotlin.String> origin=null
           WHILE label=INNER origin=FOR_LOOP_INNER_WHILE
             condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
             body: BLOCK type=kotlin.Nothing origin=null
-              VAR name:s2 type:T of <uninitialized parent> [val] 
-                CALL 'public abstract fun next (): T of <uninitialized parent> declared in kotlin.collections.Iterator' type=T of <uninitialized parent> origin=null
+              VAR name:s2 type:kotlin.String [val] 
+                CALL 'public abstract fun next (): kotlin.String declared in kotlin.collections.Iterator' type=kotlin.String origin=null
               CONTINUE label=OUTER loop.label=OUTER
               CONTINUE label=INNER loop.label=INNER
               CONTINUE label=null loop.label=INNER
           CONTINUE label=OUTER loop.label=OUTER
+
diff --git a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt
index fce0f975048..c6f79f5a72e 100644
--- a/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt
+++ b/compiler/testData/ir/irText/expressions/forWithImplicitReceivers.fir.txt
@@ -77,8 +77,7 @@ FILE fqName:<root> fileName:/forWithImplicitReceivers.kt
             VAR name:<unary> type:kotlin.Int [val] 
               CALL 'public final fun <get-value> (): kotlin.Int declared in <root>.IntCell' type=kotlin.Int origin=null
             SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
-              value: ERROR_CALL 'Unresolved reference: <Ambiguity: dec, [kotlin/dec, kotlin/dec]>#' type=IrErrorType
-                GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.IReceiver.next' type=kotlin.Int origin=null
+              value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
             GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.IReceiver.next' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -95,14 +94,15 @@ FILE fqName:<root> fileName:/forWithImplicitReceivers.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:<range> type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: FiveTimes>#' type=IrErrorType
+      VAR name:<range> type:<root>.FiveTimes [val] 
+        ERROR_CALL 'Unresolved reference: R|/FiveTimes|' type=<root>.FiveTimes
       VAR name:<iterator> type:<root>.IntCell [val] 
         CALL 'public open fun iterator (): <root>.IntCell declared in <root>.IReceiver' type=<root>.IntCell origin=null
       WHILE label=null origin=FOR_LOOP_INNER_WHILE
         condition: CALL 'public open fun hasNext (): kotlin.Boolean declared in <root>.IReceiver' type=kotlin.Boolean origin=null
-        body: BLOCK type=IrErrorType origin=null
+        body: BLOCK type=kotlin.Unit origin=null
           VAR name:i type:kotlin.Int [val] 
             CALL 'public open fun next (): kotlin.Int declared in <root>.IReceiver' type=kotlin.Int origin=null
-          ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-            GET_VAR 'val i: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
+          CALL 'public final fun println (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+            message: GET_VAR 'val i: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/funImportedFromObject.fir.txt b/compiler/testData/ir/irText/expressions/funImportedFromObject.fir.txt
index 455277f3b25..187b0e5ca69 100644
--- a/compiler/testData/ir/irText/expressions/funImportedFromObject.fir.txt
+++ b/compiler/testData/ir/irText/expressions/funImportedFromObject.fir.txt
@@ -29,3 +29,4 @@ FILE fqName:test fileName:/funImportedFromObject.kt
       RETURN type=kotlin.Nothing from='public final fun test (): kotlin.String declared in test'
         CALL 'public final fun foo <T> (): kotlin.String [inline] declared in test.Host' type=kotlin.String origin=null
           <T>: <none>
+
diff --git a/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.fir.txt b/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.fir.txt
index 09a86e1302d..133420c2ae3 100644
--- a/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/genericConstructorCallWithTypeArguments.fir.txt
@@ -1,34 +1,29 @@
 FILE fqName:<root> fileName:/genericConstructorCallWithTypeArguments.kt
-  FUN name:testSimple visibility:public modality:FINAL <> () returnType:<root>.Box<T of <root>.Box>
+  FUN name:testSimple visibility:public modality:FINAL <> () returnType:IrErrorType
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testSimple (): <root>.Box<T of <root>.Box> declared in <root>'
-        CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.Box) [primary] declared in <root>.Box' type=<root>.Box<T of <root>.Box> origin=null
-  FUN name:testArray visibility:public modality:FINAL <T> (n:kotlin.Int, block:kotlin.Function0) returnType:kotlin.Array<T of <root>.testArray> [inline]
+      RETURN type=kotlin.Nothing from='public final fun testSimple (): IrErrorType declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Box.Box]>#' type=IrErrorType
+          CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+            other: CONST Int type=kotlin.Int value=3
+  FUN name:testArray visibility:public modality:FINAL <T> (n:kotlin.Int, block:kotlin.Function0<T of <root>.testArray>) returnType:kotlin.Array<T of <root>.testArray> [inline]
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     VALUE_PARAMETER name:n index:0 type:kotlin.Int
-    VALUE_PARAMETER name:block index:1 type:kotlin.Function0 [crossinline]
+    VALUE_PARAMETER name:block index:1 type:kotlin.Function0<T of <root>.testArray> [crossinline]
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun testArray <T> (n: kotlin.Int, block: kotlin.Function0): kotlin.Array<T of <root>.testArray> [inline] declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: Array>#' type=IrErrorType
-          GET_VAR 'n: kotlin.Int declared in <root>.testArray' type=kotlin.Int origin=null
-          BLOCK type=IrErrorType origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType
-              BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.testArray'
-                  ERROR_CALL 'Unresolved reference: <Unresolved name: block>#' type=IrErrorType
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.testArray' type=IrErrorType origin=LAMBDA
+      RETURN type=kotlin.Nothing from='public final fun testArray <T> (n: kotlin.Int, block: kotlin.Function0<T of <root>.testArray>): kotlin.Array<T of <root>.testArray> [inline] declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> (size: kotlin.Int, init: kotlin.Function1<kotlin.Int, T of <uninitialized parent>>) declared in kotlin.Array' type=kotlin.Array<T of <root>.testArray> origin=null
   CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Box
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (value:T of <root>.Box) returnType:<root>.Box<T of <root>.Box> [primary]
-      VALUE_PARAMETER name:value index:0 type:T of <root>.Box
+    CONSTRUCTOR visibility:public <> (value:T of <uninitialized parent>) returnType:<root>.Box<T of <uninitialized parent>> [primary]
+      VALUE_PARAMETER name:value index:0 type:T of <uninitialized parent>
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Box modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:value visibility:public modality:FINAL [val]
       FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Box visibility:public [final]
         EXPRESSION_BODY
-          GET_VAR 'value: T of <root>.Box declared in <root>.Box.<init>' type=T of <root>.Box origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'value: T of <uninitialized parent> declared in <root>.Box.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Box) returnType:T of <root>.Box
         correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val]
         $this: VALUE_PARAMETER name:<this> type:<root>.Box
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt b/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt
index 03241fd6275..4b487641fb9 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyCall.fir.txt
@@ -14,3 +14,4 @@ FILE fqName:<root> fileName:/genericPropertyCall.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt b/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
index d84b359d9f6..5ee65610981 100644
--- a/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
+++ b/compiler/testData/ir/irText/expressions/genericPropertyRef.fir.txt
@@ -2,10 +2,10 @@ FILE fqName:<root> fileName:/genericPropertyRef.kt
   CLASS CLASS name:Value modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Value 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (value:T of <root>.Value, text:kotlin.String?) returnType:<root>.Value<T of <root>.Value> [primary] 
-      VALUE_PARAMETER name:value index:0 type:T of <root>.Value 
+    CONSTRUCTOR visibility:public <> (value:T of <uninitialized parent>, text:kotlin.String?) returnType:<root>.Value<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:value index:0 type:T of <uninitialized parent> 
         EXPRESSION_BODY
-          TYPE_OP type=T of <root>.Value origin=CAST typeOperand=T of <root>.Value
+          TYPE_OP type=T of <uninitialized parent> origin=CAST typeOperand=T of <uninitialized parent>
             CONST Null type=kotlin.Nothing? value=null
       VALUE_PARAMETER name:text index:1 type:kotlin.String? 
         EXPRESSION_BODY
@@ -16,7 +16,7 @@ FILE fqName:<root> fileName:/genericPropertyRef.kt
     PROPERTY name:value visibility:public modality:FINAL [var] 
       FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Value visibility:public 
         EXPRESSION_BODY
-          GET_VAR 'value: T of <root>.Value declared in <root>.Value.<init>' type=T of <root>.Value origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'value: T of <uninitialized parent> declared in <root>.Value.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Value) returnType:T of <root>.Value 
         correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [var] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Value 
@@ -169,3 +169,4 @@ FILE fqName:<root> fileName:/genericPropertyRef.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-barRef> (): T of <uninitialized parent> declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:barRef type:T of <uninitialized parent> visibility:public [final,static] ' type=T of <uninitialized parent> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/ifElseIf.fir.txt b/compiler/testData/ir/irText/expressions/ifElseIf.fir.txt
index 13bb7fcf0a4..07a1991cf95 100644
--- a/compiler/testData/ir/irText/expressions/ifElseIf.fir.txt
+++ b/compiler/testData/ir/irText/expressions/ifElseIf.fir.txt
@@ -20,3 +20,4 @@ FILE fqName:<root> fileName:/ifElseIf.kt
               BRANCH
                 if: CONST Boolean type=kotlin.Boolean value=true
                 then: CONST Int type=kotlin.Int value=0
+
diff --git a/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.fir.txt
index 9aaa03405e7..d0b8ae1ef94 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.fir.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastInReturnFromConstructor.fir.txt
@@ -8,7 +8,7 @@ FILE fqName:<root> fileName:/implicitCastInReturnFromConstructor.kt
     CONSTRUCTOR visibility:public <> (x:kotlin.Any?) returnType:<root>.C 
       VALUE_PARAMETER name:x index:0 type:kotlin.Any? 
       BLOCK_BODY
-        WHEN type=kotlin.Any? origin=IF
+        WHEN type=kotlin.Unit origin=IF
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Unit
               GET_VAR 'x: kotlin.Any? declared in <root>.C.<init>' type=kotlin.Any? origin=null
@@ -28,3 +28,4 @@ FILE fqName:<root> fileName:/implicitCastInReturnFromConstructor.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt
index 2d3c05fa3b3..33f1cb45157 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToNonNull.fir.txt
@@ -11,7 +11,7 @@ FILE fqName:<root> fileName:/implicitCastToNonNull.kt
             then: CONST Int type=kotlin.Int value=0
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
-            then: ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
+            then: ERROR_CALL 'No getter found for R|kotlin/String.length|' type=kotlin.Int
   FUN name:test2 visibility:public modality:FINAL <T> (x:T of <root>.test2) returnType:kotlin.Int 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:T of <root>.test2 
@@ -25,38 +25,38 @@ FILE fqName:<root> fileName:/implicitCastToNonNull.kt
             then: CONST Int type=kotlin.Int value=0
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
-            then: ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-  FUN name:test3 visibility:public modality:FINAL <T> (x:kotlin.Any) returnType:kotlin.Int [inline] 
+            then: ERROR_CALL 'No getter found for R|kotlin/CharSequence.length|' type=kotlin.Int
+  FUN name:test3 visibility:public modality:FINAL <T> (x:kotlin.Any) returnType:IrErrorType [inline] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3 <T> (x: kotlin.Any): kotlin.Int [inline] declared in <root>'
-        WHEN type=kotlin.Int origin=IF
+      RETURN type=kotlin.Nothing from='public final fun test3 <T> (x: kotlin.Any): IrErrorType [inline] declared in <root>'
+        WHEN type=IrErrorType origin=IF
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=T of <root>.test3
               GET_VAR 'x: kotlin.Any declared in <root>.test3' type=kotlin.Any origin=null
-            then: CONST Int type=kotlin.Int value=0
+            then: CONST Int type=IrErrorType value=0
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-  FUN name:test4 visibility:public modality:FINAL <T> (x:kotlin.Any?) returnType:kotlin.Int [inline] 
+  FUN name:test4 visibility:public modality:FINAL <T> (x:kotlin.Any?) returnType:IrErrorType [inline] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:kotlin.Any? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4 <T> (x: kotlin.Any?): kotlin.Int [inline] declared in <root>'
-        WHEN type=kotlin.Int origin=IF
+      RETURN type=kotlin.Nothing from='public final fun test4 <T> (x: kotlin.Any?): IrErrorType [inline] declared in <root>'
+        WHEN type=IrErrorType origin=IF
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=T of <root>.test4
               GET_VAR 'x: kotlin.Any? declared in <root>.test4' type=kotlin.Any? origin=null
-            then: CONST Int type=kotlin.Int value=0
+            then: CONST Int type=IrErrorType value=0
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-  FUN name:test5 visibility:public modality:FINAL <T, S> (x:T of <root>.test5, fn:kotlin.Function1) returnType:kotlin.Unit 
+  FUN name:test5 visibility:public modality:FINAL <T, S> (x:T of <root>.test5, fn:kotlin.Function1<S of <root>.test5, kotlin.Unit>) returnType:kotlin.Unit 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    TYPE_PARAMETER name:S index:1 variance: superTypes:[]
+    TYPE_PARAMETER name:S index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:T of <root>.test5 
-    VALUE_PARAMETER name:fn index:1 type:kotlin.Function1 
+    VALUE_PARAMETER name:fn index:1 type:kotlin.Function1<S of <root>.test5, kotlin.Unit> 
     BLOCK_BODY
       WHEN type=kotlin.Unit origin=IF
         BRANCH
@@ -66,3 +66,4 @@ FILE fqName:<root> fileName:/implicitCastToNonNull.kt
               arg1: CONST Null type=kotlin.Nothing? value=null
           then: ERROR_CALL 'Unresolved reference: <Unresolved name: fn>#' type=IrErrorType
             GET_VAR 'x: T of <root>.test5 declared in <root>.test5' type=T of <root>.test5 origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt
index 2b4e720f673..aec76026b11 100644
--- a/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt
+++ b/compiler/testData/ir/irText/expressions/implicitCastToTypeParameter.fir.txt
@@ -43,7 +43,7 @@ FILE fqName:<root> fileName:/implicitCastToTypeParameter.kt
   CLASS CLASS name:Bar modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Bar 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.Bar<T of <root>.Bar> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.Bar<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Bar modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -53,8 +53,8 @@ FILE fqName:<root> fileName:/implicitCastToTypeParameter.kt
       BLOCK_BODY
         TYPE_OP type=T of <root>.Bar origin=CAST typeOperand=T of <root>.Bar
           GET_VAR 'arg: kotlin.Any declared in <root>.Bar.test' type=kotlin.Any origin=null
-        CALL 'public final fun useT (t: T of <root>.Bar): kotlin.Unit declared in <root>.Bar' type=kotlin.Unit origin=null
-          t: GET_VAR 'arg: kotlin.Any declared in <root>.Bar.test' type=kotlin.Any origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/Bar.useT]>#' type=IrErrorType
+          GET_VAR 'arg: kotlin.Any declared in <root>.Bar.test' type=kotlin.Any origin=null
     FUN name:useT visibility:public modality:FINAL <> ($this:<root>.Bar, t:T of <root>.Bar) returnType:kotlin.Unit 
       $this: VALUE_PARAMETER name:<this> type:<root>.Bar 
       VALUE_PARAMETER name:t index:0 type:T of <root>.Bar 
@@ -72,3 +72,4 @@ FILE fqName:<root> fileName:/implicitCastToTypeParameter.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/in.fir.txt b/compiler/testData/ir/irText/expressions/in.fir.txt
index 8d58614bc0f..9ca0072c76c 100644
--- a/compiler/testData/ir/irText/expressions/in.fir.txt
+++ b/compiler/testData/ir/irText/expressions/in.fir.txt
@@ -4,7 +4,7 @@ FILE fqName:<root> fileName:/in.kt
     VALUE_PARAMETER name:x index:1 type:kotlin.collections.Collection<kotlin.Any> 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Any, x: kotlin.collections.Collection<kotlin.Any>): kotlin.Boolean declared in <root>'
-        CALL 'public abstract fun contains (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
+        CALL 'public abstract fun contains (element: kotlin.Any): kotlin.Boolean declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
           element: GET_VAR 'a: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
   FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Any, x:kotlin.collections.Collection<kotlin.Any>) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any 
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/in.kt
     VALUE_PARAMETER name:x index:1 type:kotlin.collections.Collection<T of <root>.test3> 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 <T> (a: T of <root>.test3, x: kotlin.collections.Collection<T of <root>.test3>): kotlin.Boolean declared in <root>'
-        CALL 'public abstract fun contains (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
+        CALL 'public abstract fun contains (element: T of <root>.test3): kotlin.Boolean declared in kotlin.collections.Collection' type=kotlin.Boolean origin=null
           element: GET_VAR 'a: T of <root>.test3 declared in <root>.test3' type=T of <root>.test3 origin=null
   FUN name:test4 visibility:public modality:FINAL <T> (a:T of <root>.test4, x:kotlin.collections.Collection<T of <root>.test4>) returnType:kotlin.Boolean 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
@@ -27,3 +27,4 @@ FILE fqName:<root> fileName:/in.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 <T> (a: T of <root>.test4, x: kotlin.collections.Collection<T of <root>.test4>): kotlin.Boolean declared in <root>'
         CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt
index 8fba2f91f57..c91c60eeb58 100644
--- a/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt
+++ b/compiler/testData/ir/irText/expressions/incrementDecrement.fir.txt
@@ -65,16 +65,14 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
-            value: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPrefix' type=kotlin.Int origin=null
+            value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
       VAR name:p2 type:kotlin.Int [val] 
         BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
-            value: ERROR_CALL 'Unresolved reference: <Unresolved name: dec>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPrefix' type=kotlin.Int origin=null
+            value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
   FUN name:testPropPostfix visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
@@ -83,43 +81,39 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
-            value: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPostfix' type=kotlin.Int origin=null
+            value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPostfix' type=kotlin.Int origin=null
       VAR name:p2 type:kotlin.Int [val] 
         BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
           SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:p type:kotlin.Int visibility:public [static] ' type=kotlin.Int origin=null
-            value: ERROR_CALL 'Unresolved reference: <Unresolved name: dec>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPropPostfix' type=kotlin.Int origin=null
+            value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           CALL 'public final fun <get-p> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
   FUN name:testArrayPrefix visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:a1 type:IrErrorType [val] 
-        BLOCK type=IrErrorType origin=null
+      VAR name:a1 type:kotlin.Int [val] 
+        BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun get (index: kotlin.Int): kotlin.Int declared in kotlin.IntArray' type=kotlin.Int origin=null
               index: CONST Int type=kotlin.Int value=0
-          VAR name:<unary-result> type:IrErrorType [val] 
-            ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testArrayPrefix' type=kotlin.Int origin=null
+          VAR name:<unary-result> type:kotlin.Int [val] 
+            CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in kotlin.IntArray' type=kotlin.Unit origin=null
             index: CONST Int type=kotlin.Int value=0
-            value: GET_VAR 'val <unary-result>: IrErrorType [val] declared in <root>.testArrayPrefix' type=IrErrorType origin=null
-          GET_VAR 'val <unary-result>: IrErrorType [val] declared in <root>.testArrayPrefix' type=IrErrorType origin=null
-      VAR name:a2 type:IrErrorType [val] 
-        BLOCK type=IrErrorType origin=null
+            value: GET_VAR 'val <unary-result>: kotlin.Int [val] declared in <root>.testArrayPrefix' type=kotlin.Int origin=null
+          GET_VAR 'val <unary-result>: kotlin.Int [val] declared in <root>.testArrayPrefix' type=kotlin.Int origin=null
+      VAR name:a2 type:kotlin.Int [val] 
+        BLOCK type=kotlin.Int origin=null
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun get (index: kotlin.Int): kotlin.Int declared in kotlin.IntArray' type=kotlin.Int origin=null
               index: CONST Int type=kotlin.Int value=0
-          VAR name:<unary-result> type:IrErrorType [val] 
-            ERROR_CALL 'Unresolved reference: <Unresolved name: dec>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testArrayPrefix' type=kotlin.Int origin=null
+          VAR name:<unary-result> type:kotlin.Int [val] 
+            CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in kotlin.IntArray' type=kotlin.Unit origin=null
             index: CONST Int type=kotlin.Int value=0
-            value: GET_VAR 'val <unary-result>: IrErrorType [val] declared in <root>.testArrayPrefix' type=IrErrorType origin=null
-          GET_VAR 'val <unary-result>: IrErrorType [val] declared in <root>.testArrayPrefix' type=IrErrorType origin=null
+            value: GET_VAR 'val <unary-result>: kotlin.Int [val] declared in <root>.testArrayPrefix' type=kotlin.Int origin=null
+          GET_VAR 'val <unary-result>: kotlin.Int [val] declared in <root>.testArrayPrefix' type=kotlin.Int origin=null
   FUN name:testArrayPostfix visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
       VAR name:a1 type:kotlin.Int [val] 
@@ -129,8 +123,7 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
               index: CONST Int type=kotlin.Int value=0
           CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in kotlin.IntArray' type=kotlin.Unit origin=null
             index: CONST Int type=kotlin.Int value=0
-            value: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testArrayPostfix' type=kotlin.Int origin=null
+            value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testArrayPostfix' type=kotlin.Int origin=null
       VAR name:a2 type:kotlin.Int [val] 
         BLOCK type=kotlin.Int origin=null
@@ -139,6 +132,6 @@ FILE fqName:<root> fileName:/incrementDecrement.kt
               index: CONST Int type=kotlin.Int value=0
           CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in kotlin.IntArray' type=kotlin.Unit origin=null
             index: CONST Int type=kotlin.Int value=0
-            value: ERROR_CALL 'Unresolved reference: <Unresolved name: dec>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testArrayPostfix' type=kotlin.Int origin=null
+            value: CALL 'public final fun dec (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testArrayPostfix' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt b/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt
index 18e651beaea..b4f4ede6705 100644
--- a/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt
+++ b/compiler/testData/ir/irText/expressions/interfaceThisRef.fir.txt
@@ -20,3 +20,4 @@ FILE fqName:<root> fileName:/interfaceThisRef.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt b/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt
index 7a3d4758535..17e49477003 100644
--- a/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt
+++ b/compiler/testData/ir/irText/expressions/javaSyntheticPropertyAccess.fir.txt
@@ -2,10 +2,11 @@ FILE fqName:<root> fileName:/javaSyntheticPropertyAccess.kt
   FUN name:test visibility:public modality:FINAL <> (j:<root>.J) returnType:kotlin.Unit 
     VALUE_PARAMETER name:j index:0 type:<root>.J 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: foo, [/J.foo, /J.foo]>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Ambiguity: foo, [/J.foo, /J.foo]>#' type=IrErrorType
-      VAR name:<unary> type:IrErrorType [val]
-        ERROR_CALL 'Unresolved reference: <Ambiguity: foo, [/J.foo, /J.foo]>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Ambiguity: foo, [/J.foo, /J.foo]>#' type=IrErrorType
-      GET_VAR 'val <unary>: IrErrorType [val] declared in <root>.test' type=IrErrorType origin=null
-      ERROR_CALL 'Unresolved reference: <Ambiguity: foo, [/J.foo, /J.foo]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: R|/J.foo|' type=kotlin.Int
+      ERROR_CALL 'Unresolved reference: R|/J.foo|' type=IrErrorType
+      VAR name:<unary> type:kotlin.Int [val] 
+        ERROR_CALL 'Unresolved reference: R|/J.foo|' type=kotlin.Int
+      ERROR_CALL 'Unresolved reference: R|/J.foo|' type=IrErrorType
+      GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: R|/J.foo|' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt
index 8a23857cdc5..4a9166292ce 100644
--- a/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/jvmInstanceFieldReference.fir.txt
@@ -18,45 +18,17 @@ FILE fqName:<root> fileName:/Derived.kt
       VALUE_PARAMETER name:value index:0 type:kotlin.Int 
       BLOCK_BODY
         ERROR_CALL 'Unresolved reference: R|/Base.value|' type=IrErrorType
-    FUN FAKE_OVERRIDE name:registerNatives visibility:private modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
-        private open fun registerNatives (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:getClass visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:java.lang.Class<*>? 
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
-        public final fun getClass (): java.lang.Class<*>? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Int 
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object, obj:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (obj: kotlin.Any?): kotlin.Boolean declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:obj index:0 type:kotlin.Any? 
-    FUN FAKE_OVERRIDE name:clone visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Any? 
-      overridden:
-        protected/*protected and package*/ open fun clone (): kotlin.Any? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.String? 
-      overridden:
-        public open fun toString (): kotlin.String? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notify visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notify (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notifyAll visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notifyAll (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:wait visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object, <anonymous Java parameter>:kotlin.Long) returnType:kotlin.Unit 
-      overridden:
-        public final fun wait (<anonymous Java parameter>: kotlin.Long): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:<anonymous Java parameter> index:0 type:kotlin.Long 
-    FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        protected/*protected and package*/ open fun finalize (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt
index c7b6c33ffcd..7f27f28e418 100644
--- a/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/jvmStaticFieldReference.fir.txt
@@ -1,22 +1,22 @@
 FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
   FUN name:testFun visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-        CONST String type=kotlin.String value="testFun"
+      CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+        x: CONST String type=kotlin.String value="testFun"
   PROPERTY name:testProp visibility:public modality:FINAL [var] 
     FUN name:<get-testProp> visibility:public modality:FINAL <> () returnType:kotlin.Any 
       correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] 
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-          CONST String type=kotlin.String value="testProp/get"
+        CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+          x: CONST String type=kotlin.String value="testProp/get"
         RETURN type=kotlin.Nothing from='public final fun <get-testProp> (): kotlin.Any declared in <root>'
           CONST Int type=kotlin.Any value=42
     FUN name:<set-testProp> visibility:public modality:FINAL <> (value:kotlin.Any) returnType:kotlin.Unit 
       correspondingProperty: PROPERTY name:testProp visibility:public modality:FINAL [var] 
       VALUE_PARAMETER name:value index:0 type:kotlin.Any 
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-          CONST String type=kotlin.String value="testProp/set"
+        CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+          x: CONST String type=kotlin.String value="testProp/set"
   CLASS CLASS name:TestClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.TestClass 
     CONSTRUCTOR visibility:public <> () returnType:<root>.TestClass [primary] 
@@ -30,8 +30,8 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: BLOCK type=kotlin.Int origin=null
-                ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-                  CONST String type=kotlin.String value="TestClass/test"
+                CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+                  x: CONST String type=kotlin.String value="TestClass/test"
                 CONST Int type=kotlin.Int value=42
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> ($this:<root>.TestClass) returnType:kotlin.Int 
         correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] 
@@ -42,8 +42,8 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
               receiver: GET_VAR '<this>: <root>.TestClass declared in <root>.TestClass.<get-test>' type=<root>.TestClass origin=null
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: println>#' type=IrErrorType
-          CONST String type=kotlin.String value="TestClass/init"
+        CALL 'public open fun println (x: kotlin.String?): kotlin.Unit declared in java.io.PrintStream' type=kotlin.Unit origin=null
+          x: CONST String type=kotlin.String value="TestClass/init"
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -57,3 +57,4 @@ FILE fqName:<root> fileName:/jvmStaticFieldReference.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/kt16904.fir.txt b/compiler/testData/ir/irText/expressions/kt16904.fir.txt
index 829b3f8eb2d..bb31ccfc75c 100644
--- a/compiler/testData/ir/irText/expressions/kt16904.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt16904.fir.txt
@@ -103,45 +103,17 @@ FILE fqName:<root> fileName:/kt16904.kt
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
         ERROR_CALL 'Unresolved reference: R|/J.field|' type=IrErrorType
-    FUN FAKE_OVERRIDE name:registerNatives visibility:private modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
-        private open fun registerNatives (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:getClass visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:java.lang.Class<*>? 
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
-        public final fun getClass (): java.lang.Class<*>? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Int 
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object, obj:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (obj: kotlin.Any?): kotlin.Boolean declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:obj index:0 type:kotlin.Any? 
-    FUN FAKE_OVERRIDE name:clone visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Any? 
-      overridden:
-        protected/*protected and package*/ open fun clone (): kotlin.Any? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.String? 
-      overridden:
-        public open fun toString (): kotlin.String? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notify visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notify (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notifyAll visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notifyAll (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:wait visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object, <anonymous Java parameter>:kotlin.Long) returnType:kotlin.Unit 
-      overridden:
-        public final fun wait (<anonymous Java parameter>: kotlin.Long): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:<anonymous Java parameter> index:0 type:kotlin.Long 
-    FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        protected/*protected and package*/ open fun finalize (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/kt16905.fir.txt b/compiler/testData/ir/irText/expressions/kt16905.fir.txt
index bfd28157bdf..0b4eb9b8c41 100644
--- a/compiler/testData/ir/irText/expressions/kt16905.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt16905.fir.txt
@@ -79,3 +79,4 @@ FILE fqName:<root> fileName:/kt16905.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: OI>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/kt23030.fir.txt b/compiler/testData/ir/irText/expressions/kt23030.fir.txt
index a4409ca2a87..73c9a8ae0c7 100644
--- a/compiler/testData/ir/irText/expressions/kt23030.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt23030.fir.txt
@@ -105,3 +105,4 @@ FILE fqName:<root> fileName:/kt23030.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/kt24804.fir.txt b/compiler/testData/ir/irText/expressions/kt24804.fir.txt
index aafff62a998..c6ae42eb116 100644
--- a/compiler/testData/ir/irText/expressions/kt24804.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt24804.fir.txt
@@ -34,3 +34,4 @@ FILE fqName:<root> fileName:/kt24804.kt
         CALL 'public final fun run (x: kotlin.Boolean, y: kotlin.Boolean): kotlin.String declared in <root>' type=kotlin.String origin=null
           x: CONST Boolean type=kotlin.Boolean value=true
           y: CONST Boolean type=kotlin.Boolean value=true
+
diff --git a/compiler/testData/ir/irText/expressions/kt27933.fir.txt b/compiler/testData/ir/irText/expressions/kt27933.fir.txt
index f4050aca127..8b28aa56ecd 100644
--- a/compiler/testData/ir/irText/expressions/kt27933.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt27933.fir.txt
@@ -23,3 +23,4 @@ FILE fqName:<root> fileName:/kt27933.kt
             ERROR_CALL 'Unresolved reference: R|<local>/r|' type=IrErrorType
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         GET_VAR 'var r: kotlin.String [var] declared in <root>.box' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/kt28006.fir.txt b/compiler/testData/ir/irText/expressions/kt28006.fir.txt
index 053b71e70a1..1a5287bfaf2 100644
--- a/compiler/testData/ir/irText/expressions/kt28006.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt28006.fir.txt
@@ -66,7 +66,7 @@ FILE fqName:<root> fileName:/kt28006.kt
           CONST String type=kotlin.String value="\uD83E"
           CONST String type=kotlin.String value="\uDD17"
           GET_VAR 'x: kotlin.Int declared in <root>.test1' type=kotlin.Int origin=null
-  FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.String
+  FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.String 
     VALUE_PARAMETER name:x index:0 type:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Int): kotlin.String declared in <root>'
@@ -74,7 +74,7 @@ FILE fqName:<root> fileName:/kt28006.kt
           GET_VAR 'x: kotlin.Int declared in <root>.test2' type=kotlin.Int origin=null
           CONST String type=kotlin.String value="\uD83E"
           CONST String type=kotlin.String value="\uDD17"
-  FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.String
+  FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.String 
     VALUE_PARAMETER name:x index:0 type:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Int): kotlin.String declared in <root>'
@@ -83,3 +83,4 @@ FILE fqName:<root> fileName:/kt28006.kt
           CONST String type=kotlin.String value="\uD83E"
           CONST String type=kotlin.String value="\uDD17"
           GET_VAR 'x: kotlin.Int declared in <root>.test3' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/kt28456.fir.txt b/compiler/testData/ir/irText/expressions/kt28456.fir.txt
index d92c7791f2e..e843264d4e6 100644
--- a/compiler/testData/ir/irText/expressions/kt28456.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456.fir.txt
@@ -18,10 +18,10 @@ FILE fqName:<root> fileName:/kt28456.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:get visibility:public modality:FINAL <> (xs:kotlin.Int) returnType:kotlin.Int 
-    VALUE_PARAMETER name:xs index:0 type:kotlin.Int 
+  FUN name:get visibility:public modality:FINAL <> (xs:kotlin.IntArray) returnType:kotlin.Int 
+    VALUE_PARAMETER name:xs index:0 type:kotlin.IntArray 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun get (xs: kotlin.Int): kotlin.Int declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun get (xs: kotlin.IntArray): kotlin.Int declared in <root>'
         CONST Int type=kotlin.Int value=0
   FUN name:set visibility:public modality:FINAL <> (i:kotlin.Int, j:kotlin.Int, v:kotlin.Int) returnType:kotlin.Unit 
     VALUE_PARAMETER name:i index:0 type:kotlin.Int 
@@ -47,10 +47,10 @@ FILE fqName:<root> fileName:/kt28456.kt
           CALL 'public final fun set (i: kotlin.Int, j: kotlin.Int, v: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
             i: CONST Int type=kotlin.Int value=1
             j: CONST Int type=kotlin.Int value=2
-            v: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPostfixIncrement' type=kotlin.Int origin=null
+            v: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPostfixIncrement' type=kotlin.Int origin=null
   FUN name:testCompoundAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:<root>.A 
     BLOCK_BODY
       ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
+
diff --git a/compiler/testData/ir/irText/expressions/kt28456a.fir.txt b/compiler/testData/ir/irText/expressions/kt28456a.fir.txt
index bd5076f8875..957383839b1 100644
--- a/compiler/testData/ir/irText/expressions/kt28456a.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456a.fir.txt
@@ -18,15 +18,16 @@ FILE fqName:<root> fileName:/kt28456a.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:set visibility:public modality:FINAL <> (i:kotlin.Int, v:kotlin.Int) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:i index:0 type:kotlin.Int 
+  FUN name:set visibility:public modality:FINAL <> (i:kotlin.IntArray, v:kotlin.Int) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:i index:0 type:kotlin.IntArray 
     VALUE_PARAMETER name:v index:1 type:kotlin.Int 
     BLOCK_BODY
   FUN name:testSimpleAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:<root>.A 
     BLOCK_BODY
-      ERROR_CALL 'Cannot bind 4 arguments to set call with 2 parameters' type=kotlin.Unit
+      ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/set]>#' type=IrErrorType
         CONST Int type=kotlin.Int value=1
         CONST Int type=kotlin.Int value=2
         CONST Int type=kotlin.Int value=3
         CONST Int type=kotlin.Int value=0
+
diff --git a/compiler/testData/ir/irText/expressions/kt28456b.fir.txt b/compiler/testData/ir/irText/expressions/kt28456b.fir.txt
index c4a5aac8efe..d9163ed8507 100644
--- a/compiler/testData/ir/irText/expressions/kt28456b.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt28456b.fir.txt
@@ -45,9 +45,9 @@ FILE fqName:<root> fileName:/kt28456b.kt
   FUN name:testSimpleAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:<root>.A 
     BLOCK_BODY
-      CALL 'public final fun set (i: kotlin.Int, j: kotlin.Int, v: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        i: CONST Int type=kotlin.Int value=1
-        j: CONST Int type=kotlin.Int value=0
+      ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/set]>#' type=IrErrorType
+        CONST Int type=kotlin.Int value=1
+        CONST Int type=kotlin.Int value=0
   FUN name:testPostfixIncrement visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:<root>.A 
     BLOCK_BODY
@@ -56,12 +56,12 @@ FILE fqName:<root> fileName:/kt28456b.kt
           VAR name:<unary> type:kotlin.Int [val] 
             CALL 'public final fun get (i: kotlin.Int, a: kotlin.Int, b: kotlin.Int, c: kotlin.Int, d: kotlin.Int): kotlin.Int declared in <root>' type=kotlin.Int origin=null
               i: CONST Int type=kotlin.Int value=1
-          CALL 'public final fun set (i: kotlin.Int, j: kotlin.Int, v: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-            i: CONST Int type=kotlin.Int value=1
-            j: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-              GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPostfixIncrement' type=kotlin.Int origin=null
+          ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/set]>#' type=IrErrorType
+            CONST Int type=kotlin.Int value=1
+            CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.testPostfixIncrement' type=kotlin.Int origin=null
   FUN name:testCompoundAssignment visibility:public modality:FINAL <> (a:<root>.A) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:<root>.A 
     BLOCK_BODY
       ERROR_CALL 'FirArraySetCall (resolve isn't supported yet)' type=kotlin.Unit
+
diff --git a/compiler/testData/ir/irText/expressions/kt30020.fir.txt b/compiler/testData/ir/irText/expressions/kt30020.fir.txt
index e9721370cd6..37c66b140af 100644
--- a/compiler/testData/ir/irText/expressions/kt30020.fir.txt
+++ b/compiler/testData/ir/irText/expressions/kt30020.fir.txt
@@ -36,35 +36,35 @@ FILE fqName:<root> fileName:/kt30020.kt
         TYPE_OP type=kotlin.collections.MutableList<kotlin.Int> origin=CAST typeOperand=kotlin.collections.MutableList<kotlin.Int>
           CALL 'public abstract fun f (): kotlin.collections.MutableList<kotlin.Any> declared in <root>.X' type=kotlin.collections.MutableList<kotlin.Any> origin=null
       ERROR_CALL 'Unresolved reference: R|<local>/<complex-set>|' type=IrErrorType
-      VAR name:<complex-set> type:kotlin.Nothing [val]
-        BLOCK type=kotlin.Nothing origin=EXCLEXCL
+      VAR name:<complex-set> type:kotlin.collections.MutableList<kotlin.Any> [val] 
+        BLOCK type=kotlin.collections.MutableList<kotlin.Any> origin=EXCLEXCL
           VAR name:<bangbang> type:kotlin.collections.MutableList<kotlin.Any> [val] 
             CALL 'public abstract fun <get-xs> (): kotlin.collections.MutableList<kotlin.Any> declared in <root>.X' type=kotlin.collections.MutableList<kotlin.Any> origin=null
-          WHEN type=kotlin.Nothing origin=EXCLEXCL
+          WHEN type=kotlin.collections.MutableList<kotlin.Any> origin=EXCLEXCL
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val <bangbang>: kotlin.collections.MutableList<kotlin.Any> [val] declared in <root>.test' type=kotlin.collections.MutableList<kotlin.Any> origin=null
                 arg1: CONST Null type=kotlin.Nothing? value=null
               then: THROW type=kotlin.Nothing
-                ERROR_CALL 'Unresolved reference: <Unresolved name: KotlinNullPointerException>#' type=IrErrorType
+                CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.KotlinNullPointerException' type=kotlin.KotlinNullPointerException origin=null
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: GET_VAR 'val <bangbang>: kotlin.collections.MutableList<kotlin.Any> [val] declared in <root>.test' type=kotlin.collections.MutableList<kotlin.Any> origin=null
       ERROR_CALL 'Unresolved reference: R|<local>/<complex-set>|' type=IrErrorType
-      VAR name:<complex-set> type:kotlin.Nothing [val]
-        BLOCK type=kotlin.Nothing origin=EXCLEXCL
-          VAR name:<bangbang> type:kotlin.collections.MutableList<kotlin.Any> [val] 
-            CALL 'public abstract fun f (): kotlin.collections.MutableList<kotlin.Any> declared in <root>.X' type=kotlin.collections.MutableList<kotlin.Any> origin=null
-          WHEN type=kotlin.Nothing origin=EXCLEXCL
+      VAR name:<complex-set> type:IrErrorType [val] 
+        BLOCK type=IrErrorType origin=EXCLEXCL
+          VAR name:<bangbang> type:IrErrorType [val] 
+            ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [/X.f]>#' type=IrErrorType
+          WHEN type=IrErrorType origin=EXCLEXCL
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                arg0: GET_VAR 'val <bangbang>: kotlin.collections.MutableList<kotlin.Any> [val] declared in <root>.test' type=kotlin.collections.MutableList<kotlin.Any> origin=null
+                arg0: GET_VAR 'val <bangbang>: IrErrorType [val] declared in <root>.test' type=IrErrorType origin=null
                 arg1: CONST Null type=kotlin.Nothing? value=null
               then: THROW type=kotlin.Nothing
-                ERROR_CALL 'Unresolved reference: <Unresolved name: KotlinNullPointerException>#' type=IrErrorType
+                CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.KotlinNullPointerException' type=kotlin.KotlinNullPointerException origin=null
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
-              then: GET_VAR 'val <bangbang>: kotlin.collections.MutableList<kotlin.Any> [val] declared in <root>.test' type=kotlin.collections.MutableList<kotlin.Any> origin=null
+              then: GET_VAR 'val <bangbang>: IrErrorType [val] declared in <root>.test' type=IrErrorType origin=null
       ERROR_CALL 'Unresolved reference: R|<local>/<complex-set>|' type=IrErrorType
   FUN name:testExtensionReceiver visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
@@ -102,118 +102,90 @@ FILE fqName:<root> fileName:/kt30020.kt
         overridden:
           public open fun toString (): kotlin.String declared in kotlin.Any
         $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:add visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, element:kotlin.Int) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:add visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, element:kotlin.Int) returnType:kotlin.Boolean 
       overridden:
         public abstract fun add (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
-      VALUE_PARAMETER name:element index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:addAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, index:kotlin.Int, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean
+      VALUE_PARAMETER name:element index:0 type:kotlin.Int 
+    FUN FAKE_OVERRIDE name:addAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, index:kotlin.Int, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean 
       overridden:
         public abstract fun addAll (index: kotlin.Int, elements: kotlin.collections.Collection<E of <uninitialized parent>>): kotlin.Boolean declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
       VALUE_PARAMETER name:index index:0 type:kotlin.Int 
-      VALUE_PARAMETER name:elements index:1 type:kotlin.collections.Collection<kotlin.Int>
+      VALUE_PARAMETER name:elements index:1 type:kotlin.collections.Collection<kotlin.Int> 
     FUN FAKE_OVERRIDE name:clear visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList) returnType:kotlin.Unit 
       overridden:
         public abstract fun clear (): kotlin.Unit declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
-    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList) returnType:kotlin.collections.MutableListIterator<kotlin.Int>
+    FUN FAKE_OVERRIDE name:listIterator visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList) returnType:kotlin.collections.MutableListIterator<kotlin.Int> 
       overridden:
         public abstract fun listIterator (): kotlin.collections.MutableListIterator<E of <uninitialized parent>> declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
-    FUN FAKE_OVERRIDE name:remove visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, element:kotlin.Int) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:remove visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, element:kotlin.Int) returnType:kotlin.Boolean 
       overridden:
         public abstract fun remove (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
-      VALUE_PARAMETER name:element index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:removeAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean
+      VALUE_PARAMETER name:element index:0 type:kotlin.Int 
+    FUN FAKE_OVERRIDE name:removeAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean 
       overridden:
         public abstract fun removeAll (elements: kotlin.collections.Collection<E of <uninitialized parent>>): kotlin.Boolean declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
-      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int>
-    FUN FAKE_OVERRIDE name:removeAt visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, index:kotlin.Int) returnType:kotlin.Int
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int> 
+    FUN FAKE_OVERRIDE name:removeAt visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, index:kotlin.Int) returnType:kotlin.Int 
       overridden:
         public abstract fun removeAt (index: kotlin.Int): E of <uninitialized parent> declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
       VALUE_PARAMETER name:index index:0 type:kotlin.Int 
-    FUN FAKE_OVERRIDE name:retainAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:retainAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean 
       overridden:
         public abstract fun retainAll (elements: kotlin.collections.Collection<E of <uninitialized parent>>): kotlin.Boolean declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
-      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int>
-    FUN FAKE_OVERRIDE name:set visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, index:kotlin.Int, element:kotlin.Int) returnType:kotlin.Int
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int> 
+    FUN FAKE_OVERRIDE name:set visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, index:kotlin.Int, element:kotlin.Int) returnType:kotlin.Int 
       overridden:
         public abstract fun set (index: kotlin.Int, element: E of <uninitialized parent>): E of <uninitialized parent> declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
       VALUE_PARAMETER name:index index:0 type:kotlin.Int 
-      VALUE_PARAMETER name:element index:1 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:subList visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, fromIndex:kotlin.Int, toIndex:kotlin.Int) returnType:kotlin.collections.MutableList<kotlin.Int>
+      VALUE_PARAMETER name:element index:1 type:kotlin.Int 
+    FUN FAKE_OVERRIDE name:subList visibility:public modality:ABSTRACT <> ($this:kotlin.collections.MutableList, fromIndex:kotlin.Int, toIndex:kotlin.Int) returnType:kotlin.collections.MutableList<kotlin.Int> 
       overridden:
         public abstract fun subList (fromIndex: kotlin.Int, toIndex: kotlin.Int): kotlin.collections.MutableList<E of <uninitialized parent>> declared in kotlin.collections.MutableList
       $this: VALUE_PARAMETER name:<this> type:kotlin.collections.MutableList 
       VALUE_PARAMETER name:fromIndex index:0 type:kotlin.Int 
       VALUE_PARAMETER name:toIndex index:1 type:kotlin.Int 
-    FUN FAKE_OVERRIDE name:contains visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, element:kotlin.Int) returnType:kotlin.Boolean
+    FUN FAKE_OVERRIDE name:contains visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, element:kotlin.Int) returnType:kotlin.Boolean 
       overridden:
         public abstract fun contains (element: E of <uninitialized parent>): kotlin.Boolean declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
-      VALUE_PARAMETER name:element index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:contains visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Collection, element:kotlin.Int) returnType:kotlin.Boolean
-      overridden:
-        public abstract fun contains (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.Collection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection 
-      VALUE_PARAMETER name:element index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean
+      VALUE_PARAMETER name:element index:0 type:kotlin.Int 
+    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean 
       overridden:
         public abstract fun containsAll (elements: kotlin.collections.Collection<E of <uninitialized parent>>): kotlin.Boolean declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
-      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int>
-    FUN FAKE_OVERRIDE name:containsAll visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Collection, elements:kotlin.collections.Collection<kotlin.Int>) returnType:kotlin.Boolean
-      overridden:
-        public abstract fun containsAll (elements: kotlin.collections.Collection<E of <uninitialized parent>>): kotlin.Boolean declared in kotlin.collections.Collection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection 
-      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int>
-    FUN FAKE_OVERRIDE name:get visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, index:kotlin.Int) returnType:kotlin.Int
+      VALUE_PARAMETER name:elements index:0 type:kotlin.collections.Collection<kotlin.Int> 
+    FUN FAKE_OVERRIDE name:get visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, index:kotlin.Int) returnType:kotlin.Int 
       overridden:
         public abstract fun get (index: kotlin.Int): E of <uninitialized parent> declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
       VALUE_PARAMETER name:index index:0 type:kotlin.Int 
-    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, element:kotlin.Int) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:indexOf visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, element:kotlin.Int) returnType:kotlin.Int 
       overridden:
         public abstract fun indexOf (element: E of <uninitialized parent>): kotlin.Int declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
-      VALUE_PARAMETER name:element index:0 type:kotlin.Int
+      VALUE_PARAMETER name:element index:0 type:kotlin.Int 
     FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List) returnType:kotlin.Boolean 
       overridden:
         public abstract fun isEmpty (): kotlin.Boolean declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
-    FUN FAKE_OVERRIDE name:isEmpty visibility:public modality:ABSTRACT <> ($this:kotlin.collections.Collection) returnType:kotlin.Boolean 
-      overridden:
-        public abstract fun isEmpty (): kotlin.Boolean declared in kotlin.collections.Collection
-      $this: VALUE_PARAMETER name:<this> type:kotlin.collections.Collection 
-    FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List) returnType:kotlin.collections.Iterator<kotlin.Int>
+    FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List) returnType:kotlin.collections.Iterator<kotlin.Int> 
       overridden:
         public abstract fun iterator (): kotlin.collections.Iterator<E of <uninitialized parent>> declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
-    FUN FAKE_OVERRIDE name:iterator visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.MutableCollection) returnType:kotlin.collections.MutableIterator<kotlin.Int>
-      overridden:
-        public abstract fun iterator (): kotlin.collections.MutableIterator<E of <uninitialized parent>> declared in <no parent>.MutableCollection
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.MutableCollection 
-    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, element:kotlin.Int) returnType:kotlin.Int
+    FUN FAKE_OVERRIDE name:lastIndexOf visibility:public modality:ABSTRACT <> ($this:<uninitialized parent>.List, element:kotlin.Int) returnType:kotlin.Int 
       overridden:
         public abstract fun lastIndexOf (element: E of <uninitialized parent>): kotlin.Int declared in <no parent>.List
       $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.List 
-      VALUE_PARAMETER name:element index:0 type:kotlin.Int
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+      VALUE_PARAMETER name:element index:0 type:kotlin.Int 
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -223,23 +195,8 @@ FILE fqName:<root> fileName:/kt30020.kt
       overridden:
         public open fun hashCode (): kotlin.Int declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
-      overridden:
-        public open fun hashCode (): kotlin.Int declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
-      overridden:
-        public open fun toString (): kotlin.String declared in kotlin.Any
-      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
     FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt b/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt
index 5aa703a1dfd..bcfcca83e71 100644
--- a/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt
+++ b/compiler/testData/ir/irText/expressions/lambdaInCAO.fir.txt
@@ -1,14 +1,14 @@
 FILE fqName:<root> fileName:/lambdaInCAO.kt
-  FUN name:plusAssign visibility:public modality:FINAL <> (lambda:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:lambda index:0 type:kotlin.Function0 
+  FUN name:plusAssign visibility:public modality:FINAL <> (lambda:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:lambda index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
-  FUN name:get visibility:public modality:FINAL <> (index:kotlin.Function0) returnType:kotlin.Int 
-    VALUE_PARAMETER name:index index:0 type:kotlin.Function0 
+  FUN name:get visibility:public modality:FINAL <> (index:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Int 
+    VALUE_PARAMETER name:index index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun get (index: kotlin.Function0): kotlin.Int declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun get (index: kotlin.Function0<kotlin.Unit>): kotlin.Int declared in <root>'
         CONST Int type=kotlin.Int value=42
-  FUN name:set visibility:public modality:FINAL <> (index:kotlin.Function0, value:kotlin.Int) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:index index:0 type:kotlin.Function0 
+  FUN name:set visibility:public modality:FINAL <> (index:kotlin.Function0<kotlin.Unit>, value:kotlin.Int) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:index index:0 type:kotlin.Function0<kotlin.Unit> 
     VALUE_PARAMETER name:value index:1 type:kotlin.Int 
     BLOCK_BODY
   FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit 
@@ -23,20 +23,18 @@ FILE fqName:<root> fileName:/lambdaInCAO.kt
     VALUE_PARAMETER name:a index:0 type:kotlin.Any 
     BLOCK_BODY
       VAR name:<unary> type:kotlin.Int [val] 
-        CALL 'public final fun get (index: kotlin.Function0): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-          index: BLOCK type=IrErrorType origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun get (index: kotlin.Function0<kotlin.Unit>): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+          index: BLOCK type=kotlin.Unit origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test3'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test3' type=IrErrorType origin=LAMBDA
-      CALL 'public final fun set (index: kotlin.Function0, value: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        index: BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
-            BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test3'
                 GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test3' type=IrErrorType origin=LAMBDA
-        value: ERROR_CALL 'Unresolved reference: <Unresolved name: inc>#' type=IrErrorType
-          GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test3' type=kotlin.Int origin=null
+            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test3' type=kotlin.Unit origin=LAMBDA
+      CALL 'public final fun set (index: kotlin.Function0<kotlin.Unit>, value: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+        index: BLOCK type=kotlin.Unit origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
+            BLOCK_BODY
+              GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test3' type=kotlin.Unit origin=LAMBDA
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.test3' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/literals.fir.txt b/compiler/testData/ir/irText/expressions/literals.fir.txt
index 5ba58bf82ec..d2dd1d3877a 100644
--- a/compiler/testData/ir/irText/expressions/literals.fir.txt
+++ b/compiler/testData/ir/irText/expressions/literals.fir.txt
@@ -9,10 +9,10 @@ FILE fqName:<root> fileName:/literals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
         CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Int
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Int declared in <root>'
@@ -63,10 +63,10 @@ FILE fqName:<root> fileName:/literals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test7> (): kotlin.Long declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test7 type:kotlin.Long visibility:public [final,static] ' type=kotlin.Long origin=null
   PROPERTY name:test8 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:public [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test8 type:kotlin.Long visibility:public [final,static] 
       EXPRESSION_BODY
         CALL 'public final fun unaryMinus (): kotlin.Long declared in kotlin.Long' type=kotlin.Long origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:kotlin.Long
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test8> visibility:public modality:FINAL <> () returnType:kotlin.Long 
       correspondingProperty: PROPERTY name:test8 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test8> (): kotlin.Long declared in <root>'
@@ -81,10 +81,10 @@ FILE fqName:<root> fileName:/literals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test9> (): kotlin.Double declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Double visibility:public [final,static] ' type=kotlin.Double origin=null
   PROPERTY name:test10 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:public [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test10 type:kotlin.Double visibility:public [final,static] 
       EXPRESSION_BODY
         CALL 'public final fun unaryMinus (): kotlin.Double declared in kotlin.Double' type=kotlin.Double origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test10> visibility:public modality:FINAL <> () returnType:kotlin.Double
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test10> visibility:public modality:FINAL <> () returnType:kotlin.Double 
       correspondingProperty: PROPERTY name:test10 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test10> (): kotlin.Double declared in <root>'
@@ -99,10 +99,10 @@ FILE fqName:<root> fileName:/literals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test11> (): kotlin.Float declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test11 type:kotlin.Float visibility:public [final,static] ' type=kotlin.Float origin=null
   PROPERTY name:test12 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:public [final,static]
+    FIELD PROPERTY_BACKING_FIELD name:test12 type:kotlin.Float visibility:public [final,static] 
       EXPRESSION_BODY
         CALL 'public final fun unaryMinus (): kotlin.Float declared in kotlin.Float' type=kotlin.Float origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test12> visibility:public modality:FINAL <> () returnType:kotlin.Float
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test12> visibility:public modality:FINAL <> () returnType:kotlin.Float 
       correspondingProperty: PROPERTY name:test12 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test12> (): kotlin.Float declared in <root>'
@@ -152,3 +152,4 @@ FILE fqName:<root> fileName:/literals.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-testL> (): kotlin.Long declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testL type:kotlin.Long visibility:public [final,static] ' type=kotlin.Long origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/memberTypeArguments.fir.txt b/compiler/testData/ir/irText/expressions/memberTypeArguments.fir.txt
index 9725d63797d..9ac84db6289 100644
--- a/compiler/testData/ir/irText/expressions/memberTypeArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/memberTypeArguments.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/memberTypeArguments.kt
   CLASS CLASS name:GenericClass modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.GenericClass 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (value:T of <root>.GenericClass) returnType:<root>.GenericClass<T of <root>.GenericClass> [primary] 
-      VALUE_PARAMETER name:value index:0 type:T of <root>.GenericClass 
+    CONSTRUCTOR visibility:public <> (value:T of <uninitialized parent>) returnType:<root>.GenericClass<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:value index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:GenericClass modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:value visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.GenericClass visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'value: T of <root>.GenericClass declared in <root>.GenericClass.<init>' type=T of <root>.GenericClass origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'value: T of <uninitialized parent> declared in <root>.GenericClass.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.GenericClass) returnType:T of <root>.GenericClass 
         correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.GenericClass 
@@ -18,12 +18,12 @@ FILE fqName:<root> fileName:/memberTypeArguments.kt
           RETURN type=kotlin.Nothing from='public final fun <get-value> (): T of <root>.GenericClass declared in <root>.GenericClass'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.GenericClass visibility:public [final] ' type=T of <root>.GenericClass origin=null
               receiver: GET_VAR '<this>: <root>.GenericClass declared in <root>.GenericClass.<get-value>' type=<root>.GenericClass origin=null
-    FUN name:withNewValue visibility:public modality:FINAL <> ($this:<root>.GenericClass, newValue:T of <root>.GenericClass) returnType:<root>.GenericClass<T of <root>.GenericClass> 
+    FUN name:withNewValue visibility:public modality:FINAL <> ($this:<root>.GenericClass, newValue:T of <root>.GenericClass) returnType:<root>.GenericClass<T of <root>.GenericClass>
       $this: VALUE_PARAMETER name:<this> type:<root>.GenericClass 
       VALUE_PARAMETER name:newValue index:0 type:T of <root>.GenericClass 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun withNewValue (newValue: T of <root>.GenericClass): <root>.GenericClass<T of <root>.GenericClass> declared in <root>.GenericClass'
-          CONSTRUCTOR_CALL 'public constructor <init> (value: T of <root>.GenericClass) [primary] declared in <root>.GenericClass' type=<root>.GenericClass<T of <root>.GenericClass> origin=null
+          CONSTRUCTOR_CALL 'public constructor <init> (value: T of <uninitialized parent>) [primary] declared in <root>.GenericClass' type=<root>.GenericClass<T of <root>.GenericClass> origin=null
             <class: T>: <none>
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -38,3 +38,4 @@ FILE fqName:<root> fileName:/memberTypeArguments.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt b/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt
index dccff9eb38b..c026c29e5b6 100644
--- a/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt
+++ b/compiler/testData/ir/irText/expressions/membersImportedFromObject.fir.txt
@@ -82,3 +82,4 @@ FILE fqName:<root> fileName:/membersImportedFromObject.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test4> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt b/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt
index 7e42bb6e819..307f2910d2b 100644
--- a/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt
+++ b/compiler/testData/ir/irText/expressions/multipleThisReferences.fir.txt
@@ -67,17 +67,17 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
           RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.Host'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.Host declared in <root>.Host.<get-y>' type=<root>.Host origin=null
-    FUN name:test visibility:public modality:FINAL <> ($this:<root>.Host) returnType:IrErrorType 
+    FUN name:test visibility:public modality:FINAL <> ($this:<root>.Host) returnType:<root>.Outer.Inner 
       $this: VALUE_PARAMETER name:<this> type:<root>.Host 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun test (): IrErrorType declared in <root>.Host'
+        RETURN type=kotlin.Nothing from='public final fun test (): <root>.Outer.Inner declared in <root>.Host'
           BLOCK type=<root>.Host.test.<no name provided> origin=OBJECT_LITERAL
             CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner]
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host.test.<no name provided> 
-              CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+              CONSTRUCTOR visibility:private <> () returnType:<root>.Outer.Inner [primary] 
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: kotlin.Int) [primary] declared in <root>.Outer.Inner'
-                    x: CONST Int type=IrErrorType value=42
+                    x: CONST Int type=<root>.Outer.Inner value=42
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner]'
               PROPERTY name:xx visibility:public modality:FINAL [val] 
                 FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.String visibility:public [final] 
@@ -105,3 +105,4 @@ FILE fqName:<root> fileName:/multipleThisReferences.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt
index 971c5dfdec4..9c78c292e48 100644
--- a/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt
+++ b/compiler/testData/ir/irText/expressions/objectAsCallable.fir.txt
@@ -76,21 +76,23 @@ FILE fqName:<root> fileName:/objectAsCallable.kt
       RETURN type=kotlin.Nothing from='public final fun invoke (i: kotlin.Int): kotlin.Int declared in <root>'
         GET_VAR 'i: kotlin.Int declared in <root>.invoke' type=kotlin.Int origin=null
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:<root>.A visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] 
       EXPRESSION_BODY
-        CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.A' type=<root>.A origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:<root>.A 
+        ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/A.A]>#' type=IrErrorType
+          CONST Int type=kotlin.Int value=42
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): <root>.A declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:<root>.A visibility:public [final,static] ' type=<root>.A origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): IrErrorType declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: X>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Inapplicable(PARAMETER_MAPPING_ERROR): [/En.X.X]>#' type=IrErrorType
           CONST Int type=kotlin.Int value=42
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt b/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt
index 5dab1ac4220..d8696b3cb7d 100644
--- a/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/objectClassReference.fir.txt
@@ -20,6 +20,7 @@ FILE fqName:<root> fileName:/objectClassReference.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      GET_CLASS type=IrErrorType
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
-      ERROR_CALL 'Unresolved reference: <Unresolved name: java>#' type=IrErrorType
+      GET_CLASS type=kotlin.reflect.KClass<<root>.A>
+        ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
+      ERROR_CALL 'No getter found for R|kotlin/jvm/java|' type=java.lang.Class<T of <uninitialized parent>>
+
diff --git a/compiler/testData/ir/irText/expressions/objectReference.fir.txt b/compiler/testData/ir/irText/expressions/objectReference.fir.txt
index 82e6e026345..fa013e70b74 100644
--- a/compiler/testData/ir/irText/expressions/objectReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/objectReference.fir.txt
@@ -79,14 +79,12 @@ FILE fqName:<root> fileName:/objectReference.kt
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> ($this:<root>.Z) returnType:IrErrorType 
               $this: VALUE_PARAMETER name:<this> type:<root>.Z 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.Z.aLambda'
-                  BLOCK type=kotlin.Unit origin=null
-                    SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
-                      value: CONST Int type=kotlin.Int value=1
-                    CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
-                    SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
-                      value: CONST Int type=kotlin.Int value=1
-                    CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
+                SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
+                  value: CONST Int type=kotlin.Int value=1
+                CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
+                SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
+                  value: CONST Int type=kotlin.Int value=1
+                CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
             FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.Z.aLambda' type=IrErrorType origin=LAMBDA
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-aLambda> visibility:public modality:FINAL <> ($this:<root>.Z) returnType:IrErrorType 
         correspondingProperty: PROPERTY name:aLambda visibility:public modality:FINAL [val] 
@@ -96,12 +94,12 @@ FILE fqName:<root> fileName:/objectReference.kt
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:aLambda type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
               receiver: GET_VAR '<this>: <root>.Z declared in <root>.Z.<get-aLambda>' type=<root>.Z origin=null
     PROPERTY name:anObject visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:anObject type:IrErrorType visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final] 
         EXPRESSION_BODY
           BLOCK type=<root>.Z.anObject.<no name provided> origin=OBJECT_LITERAL
             CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]
               $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.anObject.<no name provided> 
-              CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+              CONSTRUCTOR visibility:private <> () returnType:kotlin.Any [primary] 
                 BLOCK_BODY
                   DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
                   INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[kotlin.Any]'
@@ -123,12 +121,12 @@ FILE fqName:<root> fileName:/objectReference.kt
                     value: CONST Int type=kotlin.Int value=1
                   CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
             CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.Z.anObject.<no name provided>' type=<root>.Z.anObject.<no name provided> origin=null
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-anObject> visibility:public modality:FINAL <> ($this:<root>.Z) returnType:IrErrorType 
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-anObject> visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Any 
         correspondingProperty: PROPERTY name:anObject visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Z 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-anObject> (): IrErrorType declared in <root>.Z'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-anObject> (): kotlin.Any declared in <root>.Z'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anObject type:kotlin.Any visibility:public [final] ' type=kotlin.Any origin=null
               receiver: GET_VAR '<this>: <root>.Z declared in <root>.Z.<get-anObject>' type=<root>.Z origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -151,3 +149,4 @@ FILE fqName:<root> fileName:/objectReference.kt
       SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:counter type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
         value: CONST Int type=kotlin.Int value=1
       CALL 'public final fun foo (): kotlin.Unit declared in <root>.Z' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.fir.txt b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.fir.txt
index b1ee0123d9a..3e00733507e 100644
--- a/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/objectReferenceInClosureInSuperConstructorCall.fir.txt
@@ -1,21 +1,21 @@
 FILE fqName:<root> fileName:/objectReferenceInClosureInSuperConstructorCall.kt
   CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base 
-    CONSTRUCTOR visibility:public <> (lambda:kotlin.Function0) returnType:<root>.Base [primary] 
-      VALUE_PARAMETER name:lambda index:0 type:kotlin.Function0 
+    CONSTRUCTOR visibility:public <> (lambda:kotlin.Function0<kotlin.Any>) returnType:<root>.Base [primary] 
+      VALUE_PARAMETER name:lambda index:0 type:kotlin.Function0<kotlin.Any> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:lambda visibility:public modality:FINAL [val] 
-      FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:public [final] 
+      FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0<kotlin.Any> visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'lambda: kotlin.Function0 declared in <root>.Base.<init>' type=kotlin.Function0 origin=INITIALIZE_PROPERTY_FROM_PARAMETER
-      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lambda> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.Function0 
+          GET_VAR 'lambda: kotlin.Function0<kotlin.Any> declared in <root>.Base.<init>' type=kotlin.Function0<kotlin.Any> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+      FUN DEFAULT_PROPERTY_ACCESSOR name:<get-lambda> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:kotlin.Function0<kotlin.Any> 
         correspondingProperty: PROPERTY name:lambda visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Base 
         BLOCK_BODY
-          RETURN type=kotlin.Nothing from='public final fun <get-lambda> (): kotlin.Function0 declared in <root>.Base'
-            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0 visibility:public [final] ' type=kotlin.Function0 origin=null
+          RETURN type=kotlin.Nothing from='public final fun <get-lambda> (): kotlin.Function0<kotlin.Any> declared in <root>.Base'
+            GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:lambda type:kotlin.Function0<kotlin.Any> visibility:public [final] ' type=kotlin.Function0<kotlin.Any> origin=null
               receiver: GET_VAR '<this>: <root>.Base declared in <root>.Base.<get-lambda>' type=<root>.Base origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -34,12 +34,11 @@ FILE fqName:<root> fileName:/objectReferenceInClosureInSuperConstructorCall.kt
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Test 
     CONSTRUCTOR visibility:private <> () returnType:<root>.Test [primary] 
       BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (lambda: kotlin.Function0) [primary] declared in <root>.Base'
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (lambda: kotlin.Function0<kotlin.Any>) [primary] declared in <root>.Base'
           lambda: BLOCK type=IrErrorType origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.Test.<init>'
-                  ERROR_CALL 'Unresolved reference: <Unresolved name: Test>#' type=IrErrorType
+                ERROR_CALL 'Unresolved reference: Test#' type=IrErrorType
             FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.Test.<init>' type=IrErrorType origin=LAMBDA
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:Test modality:FINAL visibility:public superTypes:[<root>.Base]'
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
@@ -55,3 +54,4 @@ FILE fqName:<root> fileName:/objectReferenceInClosureInSuperConstructorCall.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt
index 20bb0d6bfbe..b40eab81e7a 100644
--- a/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt
+++ b/compiler/testData/ir/irText/expressions/objectReferenceInFieldInitializer.fir.txt
@@ -53,3 +53,4 @@ FILE fqName:<root> fileName:/objectReferenceInFieldInitializer.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt
index 3f2b3ff24f3..8309134904a 100644
--- a/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt
+++ b/compiler/testData/ir/irText/expressions/outerClassInstanceReference.fir.txt
@@ -45,3 +45,4 @@ FILE fqName:<root> fileName:/outerClassInstanceReference.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/primitiveComparisons.fir.txt b/compiler/testData/ir/irText/expressions/primitiveComparisons.fir.txt
index 65ff5961400..cdd3b3a6850 100644
--- a/compiler/testData/ir/irText/expressions/primitiveComparisons.fir.txt
+++ b/compiler/testData/ir/irText/expressions/primitiveComparisons.fir.txt
@@ -175,3 +175,4 @@ FILE fqName:<root> fileName:/primitiveComparisons.kt
         CALL 'public final fun lessOrEqual (arg0: kotlin.Double, arg1: kotlin.Double): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=LTEQ
           arg0: GET_VAR 'a: kotlin.Double declared in <root>.dtest4' type=kotlin.Double origin=null
           arg1: GET_VAR 'b: kotlin.Double declared in <root>.dtest4' type=kotlin.Double origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.fir.txt b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.fir.txt
index 45187e0aa97..909c4f6dd88 100644
--- a/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.fir.txt
+++ b/compiler/testData/ir/irText/expressions/primitivesImplicitConversions.fir.txt
@@ -107,3 +107,4 @@ FILE fqName:<root> fileName:/primitivesImplicitConversions.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
index 47d138d3a6d..4d5313c647f 100644
--- a/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
+++ b/compiler/testData/ir/irText/expressions/propertyReferences.fir.txt
@@ -236,38 +236,39 @@ FILE fqName:<root> fileName:/propertyReferences.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test_constVal> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_constVal type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:test_J_CONST visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: CONST>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_J_CONST> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        ERROR_CALL 'No getter found for R|/J.CONST|' type=kotlin.Int
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_J_CONST> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test_J_CONST visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test_J_CONST> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test_J_CONST> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_CONST type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:test_J_nonConst visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: nonConst>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_J_nonConst> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        ERROR_CALL 'No getter found for R|/J.nonConst|' type=kotlin.Int
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_J_nonConst> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test_J_nonConst visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test_J_nonConst> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test_J_nonConst> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_J_nonConst type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:test_varWithPrivateSet visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: varWithPrivateSet>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithPrivateSet> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun <get-varWithPrivateSet> (): kotlin.Int declared in <root>.C' type=kotlin.Int origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithPrivateSet> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test_varWithPrivateSet visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithPrivateSet> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithPrivateSet> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithPrivateSet type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:test_varWithProtectedSet visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: varWithProtectedSet>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithProtectedSet> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun <get-varWithProtectedSet> (): kotlin.Int declared in <root>.C' type=kotlin.Int origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test_varWithProtectedSet> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test_varWithProtectedSet visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithProtectedSet> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test_varWithProtectedSet> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test_varWithProtectedSet type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/references.fir.txt b/compiler/testData/ir/irText/expressions/references.fir.txt
index 0a02f552ad9..a3d13c36e4c 100644
--- a/compiler/testData/ir/irText/expressions/references.fir.txt
+++ b/compiler/testData/ir/irText/expressions/references.fir.txt
@@ -48,7 +48,8 @@ FILE fqName:<root> fileName:/references.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-okext> (): kotlin.String declared in <root>'
           CONST String type=kotlin.String value="OK"
-  FUN name:test5 visibility:public modality:FINAL <> () returnType:kotlin.String 
+  FUN name:test5 visibility:public modality:FINAL <> () returnType:IrErrorType 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test5 (): kotlin.String declared in <root>'
-        CALL 'public final fun <get-okext> (): kotlin.String declared in <root>' type=kotlin.String origin=null
+      RETURN type=kotlin.Nothing from='public final fun test5 (): IrErrorType declared in <root>'
+        ERROR_CALL 'Unresolved reference: <Unresolved name: okext>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt b/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt
index 415a411b07c..406a4f70661 100644
--- a/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt
+++ b/compiler/testData/ir/irText/expressions/reflectionLiterals.fir.txt
@@ -33,25 +33,25 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-qux> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:qux type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KClass<<root>.A> visibility:public [final,static] 
       EXPRESSION_BODY
-        GET_CLASS type=IrErrorType
-          ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        GET_CLASS type=kotlin.reflect.KClass<<root>.A>
+          ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.reflect.KClass<<root>.A> 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.reflect.KClass<<root>.A> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.reflect.KClass<<root>.A> visibility:public [final,static] ' type=kotlin.reflect.KClass<<root>.A> origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass<kotlin.Int> visibility:public [final,static] 
       EXPRESSION_BODY
-        GET_CLASS type=IrErrorType
+        GET_CLASS type=kotlin.reflect.KClass<kotlin.Int>
           CALL 'public final fun <get-qux> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:IrErrorType 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.reflect.KClass<kotlin.Int> 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.reflect.KClass<kotlin.Int> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.reflect.KClass<kotlin.Int> visibility:public [final,static] ' type=kotlin.reflect.KClass<kotlin.Int> origin=null
   PROPERTY name:test3 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:public [final,static] 
       EXPRESSION_BODY
@@ -62,14 +62,14 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-test3> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
   PROPERTY name:test4 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test4 type:<root>.A visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test4> visibility:public modality:FINAL <> () returnType:<root>.A 
       correspondingProperty: PROPERTY name:test4 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test4> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test4> (): <root>.A declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test4 type:<root>.A visibility:public [final,static] ' type=<root>.A origin=null
   PROPERTY name:test5 visibility:public modality:FINAL [val] 
     FIELD PROPERTY_BACKING_FIELD name:test5 type:IrErrorType visibility:public [final,static] 
       EXPRESSION_BODY
@@ -88,3 +88,4 @@ FILE fqName:<root> fileName:/reflectionLiterals.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test6> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test6 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt b/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt
index 0c7bf1059a7..9f65eca5383 100644
--- a/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt
+++ b/compiler/testData/ir/irText/expressions/safeAssignment.fir.txt
@@ -43,3 +43,4 @@ FILE fqName:<root> fileName:/safeAssignment.kt
     BLOCK_BODY
       SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:x type:kotlin.Int visibility:public ' type=kotlin.Int origin=null
         value: CONST Int type=kotlin.Int value=42
+
diff --git a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt
index d8359fc641f..33212455080 100644
--- a/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt
+++ b/compiler/testData/ir/irText/expressions/safeCallWithIncrementDecrement.fir.txt
@@ -31,7 +31,7 @@ FILE fqName:test fileName:/safeCallWithIncrementDecrement.kt
   FUN name:inc visibility:public modality:FINAL <> () returnType:kotlin.Int? 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun inc (): kotlin.Int? declared in test'
-        CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+        CALL 'public final fun inc (): kotlin.Int? declared in test' type=kotlin.Int? origin=null
   FUN name:get visibility:public modality:FINAL <> (index:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:index index:0 type:kotlin.Int 
     BLOCK_BODY
@@ -56,6 +56,6 @@ FILE fqName:test fileName:/safeCallWithIncrementDecrement.kt
           index: CONST Int type=kotlin.Int value=0
       CALL 'public final fun set (index: kotlin.Int, value: kotlin.Int): kotlin.Unit declared in test' type=kotlin.Unit origin=null
         index: CONST Int type=kotlin.Int value=0
-        value: ERROR_CALL 'Cannot bind 1 arguments to inc call with 0 parameters' type=kotlin.Int?
-          GET_VAR 'val <unary>: kotlin.Int [val] declared in test.testArrayAccess' type=kotlin.Int origin=null
+        value: CALL 'public final fun inc (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
       GET_VAR 'val <unary>: kotlin.Int [val] declared in test.testArrayAccess' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/safeCalls.fir.txt b/compiler/testData/ir/irText/expressions/safeCalls.fir.txt
index 84d1eb7c382..382bb04c3b0 100644
--- a/compiler/testData/ir/irText/expressions/safeCalls.fir.txt
+++ b/compiler/testData/ir/irText/expressions/safeCalls.fir.txt
@@ -40,11 +40,11 @@ FILE fqName:<root> fileName:/safeCalls.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   CLASS INTERFACE name:IHost modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.IHost 
-    FUN name:extLength visibility:public modality:OPEN <> ($this:<root>.IHost) returnType:IrErrorType 
+    FUN name:extLength visibility:public modality:OPEN <> ($this:<root>.IHost) returnType:kotlin.Int 
       $this: VALUE_PARAMETER name:<this> type:<root>.IHost 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public open fun extLength (): IrErrorType declared in <root>.IHost'
-          ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
+        RETURN type=kotlin.Nothing from='public open fun extLength (): kotlin.Int declared in <root>.IHost'
+          ERROR_CALL 'No getter found for R|kotlin/String.length|' type=kotlin.Int
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -58,22 +58,22 @@ FILE fqName:<root> fileName:/safeCalls.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.String?) returnType:IrErrorType 
+  FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.String?) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.String? 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.String?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.String?): kotlin.Int declared in <root>'
+        ERROR_CALL 'No getter found for R|kotlin/String.length|' type=kotlin.Int
   FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.String?) returnType:IrErrorType 
     VALUE_PARAMETER name:x index:0 type:kotlin.String? 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.String?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: hashCode, [kotlin/Any.hashCode, kotlin/Any.hashCode]>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/Any.hashCode, kotlin/Any.hashCode]>#' type=IrErrorType
   FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.String?, y:kotlin.Any?) returnType:IrErrorType 
     VALUE_PARAMETER name:x index:0 type:kotlin.String? 
     VALUE_PARAMETER name:y index:1 type:kotlin.Any? 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.String?, y: kotlin.Any?): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: equals, [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
+        ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/Any.equals, kotlin/Any.equals]>#' type=IrErrorType
           GET_VAR 'y: kotlin.Any? declared in <root>.test3' type=kotlin.Any? origin=null
   FUN name:test4 visibility:public modality:FINAL <> (x:<root>.Ref?) returnType:kotlin.Unit 
     VALUE_PARAMETER name:x index:0 type:<root>.Ref? 
@@ -84,7 +84,7 @@ FILE fqName:<root> fileName:/safeCalls.kt
     VALUE_PARAMETER name:s index:0 type:kotlin.String? 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test5 (s: kotlin.String?): IrErrorType declared in <root>'
-        CALL 'public open fun extLength (): IrErrorType declared in <root>.IHost' type=IrErrorType origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [/IHost.extLength]>#' type=IrErrorType
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Int declared in <root>'
@@ -92,3 +92,4 @@ FILE fqName:<root> fileName:/safeCalls.kt
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
       CALL 'public final fun foo (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt
index fcd8ba689b6..db89984baba 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConstructors.fir.txt
@@ -6,15 +6,14 @@ FILE fqName:<root> fileName:/samConstructors.kt
           BLOCK type=IrErrorType origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
             FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test1' type=IrErrorType origin=LAMBDA
-  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:IrErrorType 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:IrErrorType 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Function0): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Function0<kotlin.Unit>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: Runnable>#' type=IrErrorType
-          GET_VAR 'a: kotlin.Function0 declared in <root>.test2' type=kotlin.Function0 origin=null
+          GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test2' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:foo visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
   FUN name:test3 visibility:public modality:FINAL <> () returnType:IrErrorType 
@@ -31,7 +30,7 @@ FILE fqName:<root> fileName:/samConstructors.kt
               VALUE_PARAMETER name:a index:0 type:IrErrorType 
               VALUE_PARAMETER name:b index:1 type:IrErrorType 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (a: IrErrorType, b: IrErrorType): IrErrorType declared in <root>.test4'
-                  ERROR_CALL 'Unresolved reference: <Unresolved name: minus>#' type=IrErrorType
-                    GET_VAR 'b: IrErrorType declared in <root>.test4.<anonymous>' type=IrErrorType origin=null
+                ERROR_CALL 'Unresolved reference: minus#' type=IrErrorType
+                  ERROR_CALL 'Unresolved reference: b#' type=IrErrorType
             FUNCTION_REFERENCE 'local final fun <anonymous> (a: IrErrorType, b: IrErrorType): IrErrorType declared in <root>.test4' type=IrErrorType origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt
index 1148193a123..b4e570b964f 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversions.fir.txt
@@ -8,38 +8,37 @@ FILE fqName:<root> fileName:/samConversions.kt
         r: GET_VAR 'a: java.lang.Runnable declared in <root>.test0' type=java.lang.Runnable origin=null
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Unresolved name: runStatic>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public open fun runStatic (r: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+        r: BLOCK type=IrErrorType origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                CALL 'public final fun test1 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test1' type=IrErrorType origin=LAMBDA
+              CALL 'public final fun test1 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test1' type=IrErrorType origin=LAMBDA
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
       CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
         r: BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test2'
-                CALL 'public final fun test1 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test2' type=IrErrorType origin=LAMBDA
-  FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+              CALL 'public final fun test1 (): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test2' type=IrErrorType origin=LAMBDA
+  FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
-      CALL 'public open fun run2 (r1: java.lang.Runnable?, r2: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        r1: GET_VAR 'a: kotlin.Function0 declared in <root>.test3' type=kotlin.Function0 origin=null
-        r2: GET_VAR 'a: kotlin.Function0 declared in <root>.test3' type=kotlin.Function0 origin=null
-  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Function0, b:kotlin.Function0, flag:kotlin.Boolean) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
-    VALUE_PARAMETER name:b index:1 type:kotlin.Function0 
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/J.run2]>#' type=IrErrorType
+        GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test3' type=kotlin.Function0<kotlin.Unit> origin=null
+        GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test3' type=kotlin.Function0<kotlin.Unit> origin=null
+  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>, b:kotlin.Function0<kotlin.Unit>, flag:kotlin.Boolean) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
+    VALUE_PARAMETER name:b index:1 type:kotlin.Function0<kotlin.Unit> 
     VALUE_PARAMETER name:flag index:2 type:kotlin.Boolean 
     BLOCK_BODY
-      CALL 'public open fun runIt (r: java.lang.Runnable?): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
-        r: WHEN type=kotlin.Function0 origin=IF
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/J.runIt]>#' type=IrErrorType
+        WHEN type=kotlin.Function0<kotlin.Unit> origin=IF
           BRANCH
             if: GET_VAR 'flag: kotlin.Boolean declared in <root>.test4' type=kotlin.Boolean origin=null
-            then: GET_VAR 'a: kotlin.Function0 declared in <root>.test4' type=kotlin.Function0 origin=null
+            then: GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test4' type=kotlin.Function0<kotlin.Unit> origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
-            then: GET_VAR 'b: kotlin.Function0 declared in <root>.test4' type=kotlin.Function0 origin=null
+            then: GET_VAR 'b: kotlin.Function0<kotlin.Unit> declared in <root>.test4' type=kotlin.Function0<kotlin.Unit> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
index 2e5e9813b4f..1ba0c2cdde2 100644
--- a/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samConversionsWithSmartCasts.fir.txt
@@ -1,43 +1,43 @@
 FILE fqName:<root> fileName:/samConversionsWithSmartCasts.kt
-  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
       WHEN type=kotlin.Unit origin=IF
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test1' type=kotlin.Function0 origin=null
-          then: ERROR_CALL 'Unresolved reference: <Unresolved name: runStatic>#' type=IrErrorType
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test1' type=kotlin.Function0 origin=null
-  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test1' type=kotlin.Function0<kotlin.Unit> origin=null
+          then: ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/J.runStatic]>#' type=IrErrorType
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test1' type=kotlin.Function0<kotlin.Unit> origin=null
+  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
       WHEN type=kotlin.Unit origin=IF
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test2' type=kotlin.Function0 origin=null
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test2' type=kotlin.Function0<kotlin.Unit> origin=null
           then: ERROR_CALL 'Unresolved reference: <Unresolved name: run1>#' type=IrErrorType
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test2' type=kotlin.Function0 origin=null
-  FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test2' type=kotlin.Function0<kotlin.Unit> origin=null
+  FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
       WHEN type=kotlin.Unit origin=IF
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test3' type=kotlin.Function0 origin=null
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test3' type=kotlin.Function0<kotlin.Unit> origin=null
           then: ERROR_CALL 'Unresolved reference: <Unresolved name: run2>#' type=IrErrorType
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test3' type=kotlin.Function0 origin=null
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test3' type=kotlin.Function0 origin=null
-  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Function0, b:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
-    VALUE_PARAMETER name:b index:1 type:kotlin.Function0 
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test3' type=kotlin.Function0<kotlin.Unit> origin=null
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test3' type=kotlin.Function0<kotlin.Unit> origin=null
+  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>, b:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
+    VALUE_PARAMETER name:b index:1 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
       WHEN type=kotlin.Unit origin=IF
         BRANCH
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test4' type=kotlin.Function0 origin=null
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test4' type=kotlin.Function0<kotlin.Unit> origin=null
           then: ERROR_CALL 'Unresolved reference: <Unresolved name: run2>#' type=IrErrorType
-            GET_VAR 'a: kotlin.Function0 declared in <root>.test4' type=kotlin.Function0 origin=null
-            GET_VAR 'b: kotlin.Function0 declared in <root>.test4' type=kotlin.Function0 origin=null
+            GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test4' type=kotlin.Function0<kotlin.Unit> origin=null
+            GET_VAR 'b: kotlin.Function0<kotlin.Unit> declared in <root>.test4' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:test5 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -55,31 +55,32 @@ FILE fqName:<root> fileName:/samConversionsWithSmartCasts.kt
           if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=java.lang.Runnable
             GET_VAR 'a: kotlin.Any declared in <root>.test5x' type=kotlin.Any origin=null
           then: BLOCK type=IrErrorType origin=null
-            TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0
+            TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
               GET_VAR 'a: kotlin.Any declared in <root>.test5x' type=kotlin.Any origin=null
             ERROR_CALL 'Unresolved reference: <Unresolved name: run1>#' type=IrErrorType
               GET_VAR 'a: kotlin.Any declared in <root>.test5x' type=kotlin.Any origin=null
   FUN name:test6 visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any 
     BLOCK_BODY
-      TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0
+      TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
         GET_VAR 'a: kotlin.Any declared in <root>.test6' type=kotlin.Any origin=null
       ERROR_CALL 'Unresolved reference: <Unresolved name: run1>#' type=IrErrorType
         GET_VAR 'a: kotlin.Any declared in <root>.test6' type=kotlin.Any origin=null
-  FUN name:test7 visibility:public modality:FINAL <> (a:kotlin.Function1) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function1 
+  FUN name:test7 visibility:public modality:FINAL <> (a:kotlin.Function1<kotlin.Int, kotlin.Int>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function1<kotlin.Int, kotlin.Int> 
     BLOCK_BODY
-      TYPE_OP type=kotlin.Function0 origin=CAST typeOperand=kotlin.Function0
-        GET_VAR 'a: kotlin.Function1 declared in <root>.test7' type=kotlin.Function1 origin=null
+      TYPE_OP type=kotlin.Function0<kotlin.Unit> origin=CAST typeOperand=kotlin.Function0<kotlin.Unit>
+        GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
       ERROR_CALL 'Unresolved reference: <Unresolved name: run1>#' type=IrErrorType
-        GET_VAR 'a: kotlin.Function1 declared in <root>.test7' type=kotlin.Function1 origin=null
-  FUN name:test8 visibility:public modality:FINAL <> (a:kotlin.Function0) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:a index:0 type:kotlin.Function0 
+        GET_VAR 'a: kotlin.Function1<kotlin.Int, kotlin.Int> declared in <root>.test7' type=kotlin.Function1<kotlin.Int, kotlin.Int> origin=null
+  FUN name:test8 visibility:public modality:FINAL <> (a:kotlin.Function0<kotlin.Unit>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:a index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
       ERROR_CALL 'Unresolved reference: <Unresolved name: run1>#' type=IrErrorType
-        ERROR_CALL 'Unresolved reference: <Unresolved name: id>#' type=IrErrorType
-          GET_VAR 'a: kotlin.Function0 declared in <root>.test8' type=kotlin.Function0 origin=null
+        CALL 'public open fun id (x: T of <uninitialized parent>?): T of <uninitialized parent>? declared in <root>.J' type=IrErrorType origin=null
+          x: GET_VAR 'a: kotlin.Function0<kotlin.Unit> declared in <root>.test8' type=kotlin.Function0<kotlin.Unit> origin=null
   FUN name:test9 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
       ERROR_CALL 'Unresolved reference: <Unresolved name: run1>#' type=IrErrorType
         ERROR_CALL 'Unresolved reference: <Unresolved name: test9>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt b/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt
index b5ff57a6d38..9ae79ca94bb 100644
--- a/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt
+++ b/compiler/testData/ir/irText/expressions/sam/samOperators.fir.txt
@@ -21,3 +21,4 @@ FILE fqName:<root> fileName:/samOperators.kt
     BLOCK_BODY
       ERROR_CALL 'Unresolved reference: this#' type=IrErrorType
       ERROR_CALL 'Unresolved reference: this#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt
index 0d14f6b7dcd..dfca91c6de5 100644
--- a/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt
+++ b/compiler/testData/ir/irText/expressions/setFieldWithImplicitCast.fir.txt
@@ -15,45 +15,17 @@ FILE fqName:<root> fileName:/Derived.kt
               GET_VAR 'v: kotlin.Any declared in <root>.Derived.setValue' type=kotlin.Any origin=null
             then: BLOCK type=kotlin.Unit origin=null
               ERROR_CALL 'Unresolved reference: R|/Base.value|' type=IrErrorType
-    FUN FAKE_OVERRIDE name:registerNatives visibility:private modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
-        private open fun registerNatives (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:getClass visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:java.lang.Class<*>? 
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
-        public final fun getClass (): java.lang.Class<*>? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Int 
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object, obj:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (obj: kotlin.Any?): kotlin.Boolean declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:obj index:0 type:kotlin.Any? 
-    FUN FAKE_OVERRIDE name:clone visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Any? 
-      overridden:
-        protected/*protected and package*/ open fun clone (): kotlin.Any? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.String? 
-      overridden:
-        public open fun toString (): kotlin.String? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notify visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notify (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notifyAll visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notifyAll (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:wait visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object, <anonymous Java parameter>:kotlin.Long) returnType:kotlin.Unit 
-      overridden:
-        public final fun wait (<anonymous Java parameter>: kotlin.Long): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:<anonymous Java parameter> index:0 type:kotlin.Long 
-    FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        protected/*protected and package*/ open fun finalize (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_annotation.fir.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_annotation.fir.txt
index f79e78ced57..8742c09d9f8 100644
--- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_annotation.fir.txt
+++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_annotation.fir.txt
@@ -15,3 +15,4 @@ FILE fqName:kotlin.internal fileName:/signedToUnsignedConversions_annotation.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt
index 715adac28ba..2fb65b6be2b 100644
--- a/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt
+++ b/compiler/testData/ir/irText/expressions/signedToUnsignedConversions_test.fir.txt
@@ -77,29 +77,30 @@ FILE fqName:<root> fileName:/signedToUnsignedConversions_test.kt
   FUN name:takeULong visibility:public modality:FINAL <> (u:kotlin.ULong) returnType:kotlin.Unit 
     VALUE_PARAMETER name:u index:0 type:kotlin.ULong 
     BLOCK_BODY
-  FUN name:takeUBytes visibility:public modality:FINAL <> (u:kotlin.UByte) returnType:kotlin.Unit 
-    VALUE_PARAMETER name:u index:0 type:kotlin.UByte 
+  FUN name:takeUBytes visibility:public modality:FINAL <> (u:kotlin.Array<kotlin.UByte>) returnType:kotlin.Unit 
+    VALUE_PARAMETER name:u index:0 type:kotlin.Array<kotlin.UByte> 
     BLOCK_BODY
   FUN name:takeLong visibility:public modality:FINAL <> (l:kotlin.Long) returnType:kotlin.Unit 
     VALUE_PARAMETER name:l index:0 type:kotlin.Long 
     BLOCK_BODY
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      CALL 'public final fun takeUByte (u: kotlin.UByte): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        u: CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      CALL 'public final fun takeUByte (u: kotlin.UByte): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        u: CALL 'public final fun <get-EXPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      CALL 'public final fun takeUShort (u: kotlin.UShort): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        u: CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      CALL 'public final fun takeUShort (u: kotlin.UShort): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        u: CALL 'public final fun <get-BIGGER_THAN_UBYTE> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      CALL 'public final fun takeUInt (u: kotlin.UInt): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        u: CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      CALL 'public final fun takeULong (u: kotlin.ULong): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        u: CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      ERROR_CALL 'Cannot bind 3 arguments to takeUBytes call with 1 parameters' type=kotlin.Unit
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUByte]>#' type=IrErrorType
+        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUByte]>#' type=IrErrorType
+        CALL 'public final fun <get-EXPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUShort]>#' type=IrErrorType
+        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUShort]>#' type=IrErrorType
+        CALL 'public final fun <get-BIGGER_THAN_UBYTE> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUInt]>#' type=IrErrorType
+        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeULong]>#' type=IrErrorType
+        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeUBytes]>#' type=IrErrorType
         CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
         CALL 'public final fun <get-EXPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
         CONST Long type=kotlin.Long value=42
-      CALL 'public final fun takeLong (l: kotlin.Long): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        l: CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/takeLong]>#' type=IrErrorType
+        CALL 'public final fun <get-IMPLICIT_INT> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/simpleOperators.fir.txt b/compiler/testData/ir/irText/expressions/simpleOperators.fir.txt
index beff345b4ef..6340aeab9fa 100644
--- a/compiler/testData/ir/irText/expressions/simpleOperators.fir.txt
+++ b/compiler/testData/ir/irText/expressions/simpleOperators.fir.txt
@@ -1,78 +1,79 @@
 FILE fqName:<root> fileName:/simpleOperators.kt
-  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+  FUN name:test1 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test1' type=kotlin.Int origin=null
-  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1 (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test1' type=kotlin.Int origin=null
+  FUN name:test2 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: minus, [kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test2' type=kotlin.Int origin=null
-  FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test2 (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun minus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test2' type=kotlin.Int origin=null
+  FUN name:test3 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3 (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: times, [kotlin/Int.times, kotlin/Int.times, kotlin/Int.times, kotlin/Int.times, kotlin/Int.times, kotlin/Int.times]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test3' type=kotlin.Int origin=null
-  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test3 (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test3' type=kotlin.Int origin=null
+  FUN name:test4 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4 (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: div, [kotlin/Int.div, kotlin/Int.div, kotlin/Int.div, kotlin/Int.div, kotlin/Int.div, kotlin/Int.div]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test4' type=kotlin.Int origin=null
-  FUN name:test5 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test4 (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun div (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test4' type=kotlin.Int origin=null
+  FUN name:test5 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test5 (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: rem, [kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test5' type=kotlin.Int origin=null
-  FUN name:test6 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test5 (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun rem (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test5' type=kotlin.Int origin=null
+  FUN name:test6 visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.ranges.IntRange 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test6 (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: rangeTo, [kotlin/Int.rangeTo, kotlin/Int.rangeTo, kotlin/Int.rangeTo, kotlin/Int.rangeTo]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test6' type=kotlin.Int origin=null
-  FUN name:test1x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test6 (a: kotlin.Int, b: kotlin.Int): kotlin.ranges.IntRange declared in <root>'
+        CALL 'public final fun rangeTo (other: kotlin.Int): kotlin.ranges.IntRange declared in kotlin.Int' type=kotlin.ranges.IntRange origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test6' type=kotlin.Int origin=null
+  FUN name:test1x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1x (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test1x' type=kotlin.Int origin=null
-  FUN name:test2x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1x (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test1x' type=kotlin.Int origin=null
+  FUN name:test2x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2x (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: minus, [kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus, kotlin/Int.minus]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test2x' type=kotlin.Int origin=null
-  FUN name:test3x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test2x (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun minus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test2x' type=kotlin.Int origin=null
+  FUN name:test3x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test3x (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: times, [kotlin/Int.times, kotlin/Int.times, kotlin/Int.times, kotlin/Int.times, kotlin/Int.times, kotlin/Int.times]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test3x' type=kotlin.Int origin=null
-  FUN name:test4x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test3x (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun times (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test3x' type=kotlin.Int origin=null
+  FUN name:test4x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4x (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: div, [kotlin/Int.div, kotlin/Int.div, kotlin/Int.div, kotlin/Int.div, kotlin/Int.div, kotlin/Int.div]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test4x' type=kotlin.Int origin=null
-  FUN name:test5x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test4x (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun div (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test4x' type=kotlin.Int origin=null
+  FUN name:test5x visibility:public modality:FINAL <> (a:kotlin.Int, b:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:a index:0 type:kotlin.Int 
     VALUE_PARAMETER name:b index:1 type:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test5x (a: kotlin.Int, b: kotlin.Int): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: rem, [kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem, kotlin/Int.rem]>#' type=IrErrorType
-          GET_VAR 'b: kotlin.Int declared in <root>.test5x' type=kotlin.Int origin=null
+      RETURN type=kotlin.Nothing from='public final fun test5x (a: kotlin.Int, b: kotlin.Int): kotlin.Int declared in <root>'
+        CALL 'public final fun rem (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: GET_VAR 'b: kotlin.Int declared in <root>.test5x' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/simpleUnaryOperators.fir.txt b/compiler/testData/ir/irText/expressions/simpleUnaryOperators.fir.txt
index f49238dda8d..7fe51a06316 100644
--- a/compiler/testData/ir/irText/expressions/simpleUnaryOperators.fir.txt
+++ b/compiler/testData/ir/irText/expressions/simpleUnaryOperators.fir.txt
@@ -1,28 +1,29 @@
 FILE fqName:<root> fileName:/simpleUnaryOperators.kt
-  FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Int
+  FUN name:test1 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test1 (x: kotlin.Int): kotlin.Int declared in <root>'
         CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-  FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Int
+  FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Int declared in <root>'
         CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-  FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Int
+  FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Int) returnType:kotlin.Int 
     VALUE_PARAMETER name:x index:0 type:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Int): kotlin.Int declared in <root>'
         CALL 'public final fun unaryPlus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-  FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Int
+  FUN name:test4 visibility:public modality:FINAL <> () returnType:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (): kotlin.Int declared in <root>'
         CALL 'public final fun unaryPlus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
-  FUN name:test5 visibility:public modality:FINAL <> (x:kotlin.Boolean) returnType:kotlin.Boolean
+  FUN name:test5 visibility:public modality:FINAL <> (x:kotlin.Boolean) returnType:kotlin.Boolean 
     VALUE_PARAMETER name:x index:0 type:kotlin.Boolean 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test5 (x: kotlin.Boolean): kotlin.Boolean declared in <root>'
         CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null
-  FUN name:test6 visibility:public modality:FINAL <> () returnType:kotlin.Boolean
+  FUN name:test6 visibility:public modality:FINAL <> () returnType:kotlin.Boolean 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test6 (): kotlin.Boolean declared in <root>'
         CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/smartCasts.fir.txt b/compiler/testData/ir/irText/expressions/smartCasts.fir.txt
index 46f060ba795..3ce0fd1c673 100644
--- a/compiler/testData/ir/irText/expressions/smartCasts.fir.txt
+++ b/compiler/testData/ir/irText/expressions/smartCasts.fir.txt
@@ -26,13 +26,13 @@ FILE fqName:<root> fileName:/smartCasts.kt
             GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
       ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
         ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-      CALL 'public final fun expectsString (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        s: GET_VAR 'x: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/expectsString]>#' type=IrErrorType
+        GET_VAR 'x: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
       CALL 'public final fun expectsInt (i: kotlin.Int): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
         i: ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-      CALL 'public final fun expectsString (s: kotlin.String): kotlin.Unit declared in <root>' type=kotlin.Unit origin=null
-        s: ERROR_CALL 'Unresolved reference: <Ambiguity: overloaded, [/overloaded, /overloaded]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/expectsString]>#' type=IrErrorType
+        CALL 'public final fun overloaded (x: kotlin.Any): kotlin.Any declared in <root>' type=kotlin.Any origin=null
+          x: GET_VAR 'x: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
   FUN name:test2 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.String 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -43,8 +43,8 @@ FILE fqName:<root> fileName:/smartCasts.kt
           then: RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Any): kotlin.String declared in <root>'
             CONST String type=kotlin.String value=""
       RETURN type=kotlin.Nothing from='public final fun test2 (x: kotlin.Any): kotlin.String declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: overloaded, [/overloaded, /overloaded]>#' type=IrErrorType
-          GET_VAR 'x: kotlin.Any declared in <root>.test2' type=kotlin.Any origin=null
+        CALL 'public final fun overloaded (x: kotlin.Any): kotlin.Any declared in <root>' type=kotlin.Any origin=null
+          x: GET_VAR 'x: kotlin.Any declared in <root>.test2' type=kotlin.Any origin=null
   FUN name:test3 visibility:public modality:FINAL <> (x:kotlin.Any) returnType:kotlin.String 
     VALUE_PARAMETER name:x index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -56,3 +56,4 @@ FILE fqName:<root> fileName:/smartCasts.kt
             CONST String type=kotlin.String value=""
       RETURN type=kotlin.Nothing from='public final fun test3 (x: kotlin.Any): kotlin.String declared in <root>'
         GET_VAR 'x: kotlin.Any declared in <root>.test3' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.txt b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.txt
index 5864fe13a50..ac3b89bf6d0 100644
--- a/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.txt
+++ b/compiler/testData/ir/irText/expressions/smartCastsWithDestructuring.fir.txt
@@ -50,5 +50,6 @@ FILE fqName:<root> fileName:/smartCastsWithDestructuring.kt
         GET_VAR 'x: <root>.I1 declared in <root>.test' type=<root>.I1 origin=null
       VAR name:c1 type:kotlin.Int [val] 
         CALL 'public final fun component1 (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-      VAR name:c2 type:kotlin.String [val] 
-        CALL 'public final fun component2 (): kotlin.String declared in <root>' type=kotlin.String origin=null
+      VAR name:c2 type:IrErrorType [val] 
+        ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [/component2]>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
index b0dd4c7d4de..98a758306fc 100644
--- a/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/specializedTypeAliasConstructorCall.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
   CLASS CLASS name:Cell modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Cell 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (value:T of <root>.Cell) returnType:<root>.Cell<T of <root>.Cell> [primary] 
-      VALUE_PARAMETER name:value index:0 type:T of <root>.Cell 
+    CONSTRUCTOR visibility:public <> (value:T of <uninitialized parent>) returnType:<root>.Cell<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:value index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Cell modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:value visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:value type:T of <root>.Cell visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'value: T of <root>.Cell declared in <root>.Cell.<init>' type=T of <root>.Cell origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'value: T of <uninitialized parent> declared in <root>.Cell.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-value> visibility:public modality:FINAL <> ($this:<root>.Cell) returnType:T of <root>.Cell 
         correspondingProperty: PROPERTY name:value visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Cell 
@@ -31,8 +31,8 @@ FILE fqName:<root> fileName:/specializedTypeAliasConstructorCall.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:test visibility:public modality:FINAL <> () returnType:IrErrorType 
+  FUN name:test visibility:public modality:FINAL <> () returnType:<root>.Cell<kotlin.Int>
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: IntAlias>#' type=IrErrorType
-          CONST Int type=kotlin.Int value=42
+      RETURN type=kotlin.Nothing from='public final fun test (): <root>.Cell<kotlin.Int> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> (value: T of <uninitialized parent>) [primary] declared in <root>.Cell' type=<root>.Cell<kotlin.Int> origin=null
+          <class: T>: <none>
diff --git a/compiler/testData/ir/irText/expressions/stringComparisons.fir.txt b/compiler/testData/ir/irText/expressions/stringComparisons.fir.txt
index b0a5a995bda..a606d803274 100644
--- a/compiler/testData/ir/irText/expressions/stringComparisons.fir.txt
+++ b/compiler/testData/ir/irText/expressions/stringComparisons.fir.txt
@@ -23,3 +23,4 @@ FILE fqName:<root> fileName:/stringComparisons.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (a: kotlin.String, b: kotlin.String): kotlin.Boolean declared in <root>'
         ERROR_CALL 'Comparison of arguments with unsupported type: kotlin/String' type=kotlin.Boolean
+
diff --git a/compiler/testData/ir/irText/expressions/stringPlus.fir.txt b/compiler/testData/ir/irText/expressions/stringPlus.fir.txt
index 7a8eb4cc126..73a422bb166 100644
--- a/compiler/testData/ir/irText/expressions/stringPlus.fir.txt
+++ b/compiler/testData/ir/irText/expressions/stringPlus.fir.txt
@@ -20,3 +20,4 @@ FILE fqName:<root> fileName:/stringPlus.kt
       RETURN type=kotlin.Nothing from='public final fun test3 (a: kotlin.String, b: kotlin.Int): kotlin.String declared in <root>'
         CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin.String' type=kotlin.String origin=null
           other: GET_VAR 'a: kotlin.String declared in <root>.test3' type=kotlin.String origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt b/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt
index 9b65d9a2509..89b89daeda4 100644
--- a/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt
+++ b/compiler/testData/ir/irText/expressions/stringTemplates.fir.txt
@@ -96,3 +96,4 @@ FILE fqName:<root> fileName:/stringTemplates.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test9> (): kotlin.Int declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test9 type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt
index bdc298ba0ec..c83299490ba 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInEnumEntryInitializer.fir.txt
@@ -31,7 +31,7 @@ FILE fqName:<root> fileName:/temporaryInEnumEntryInitializer.kt
       CONSTRUCTOR visibility:public <> () returnType:<root>.En.ENTRY [primary] 
         BLOCK_BODY
           DELEGATING_CONSTRUCTOR_CALL 'private constructor <init> (x: kotlin.String?) [primary] declared in <root>.En'
-            x: CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+            x: CALL 'public final fun toString (): kotlin.String declared in kotlin' type=kotlin.String origin=null
           INSTANCE_INITIALIZER_CALL classDescriptor='CLASS ENUM_ENTRY name:ENTRY modality:FINAL visibility:public superTypes:[<root>.En]'
       FUN FAKE_OVERRIDE name:clone visibility:protected modality:FINAL <> ($this:kotlin.Enum) returnType:kotlin.Any 
         overridden:
@@ -77,3 +77,4 @@ FILE fqName:<root> fileName:/temporaryInEnumEntryInitializer.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt
index 5f7e932785e..e26ead6d7dd 100644
--- a/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt
+++ b/compiler/testData/ir/irText/expressions/temporaryInInitBlock.fir.txt
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/temporaryInInitBlock.kt
     ANONYMOUS_INITIALIZER isStatic=false
       BLOCK_BODY
         SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:s type:kotlin.String? visibility:public [final] ' type=kotlin.String? origin=null
-          value: CALL 'public open fun toString (): kotlin.String declared in kotlin.Any' type=kotlin.String origin=null
+          value: CALL 'public final fun toString (): kotlin.String declared in kotlin' type=kotlin.String origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -32,3 +32,4 @@ FILE fqName:<root> fileName:/temporaryInInitBlock.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
index 59f4ce0869a..8117ddbef2e 100644
--- a/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
+++ b/compiler/testData/ir/irText/expressions/thisOfGenericOuterClass.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
   CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Outer 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Outer) returnType:<root>.Outer<T of <root>.Outer> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Outer 
+    CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Outer<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Outer modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Outer visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: T of <root>.Outer declared in <root>.Outer.<init>' type=T of <root>.Outer origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: T of <uninitialized parent> declared in <root>.Outer.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Outer) returnType:T of <root>.Outer 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Outer 
@@ -62,27 +62,27 @@ FILE fqName:<root> fileName:/thisOfGenericOuterClass.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:test visibility:public modality:FINAL <> () returnType:IrErrorType 
+  FUN name:test visibility:public modality:FINAL <> () returnType:<root>.Outer.Inner<kotlin.Int> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test (): <root>.Outer.Inner<kotlin.Int> declared in <root>'
         BLOCK type=<root>.test.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner<kotlin.Int>]
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:<root>.Outer.Inner<kotlin.Int> [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (y: kotlin.Int) [primary] declared in <root>.Outer.Inner'
-                  y: CONST Int type=IrErrorType value=42
+                  y: CONST Int type=<root>.Outer.Inner<kotlin.Int> value=42
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.Outer.Inner<kotlin.Int>]'
             PROPERTY name:xx visibility:public modality:FINAL [val] 
-              FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.String visibility:public [final] 
+              FIELD PROPERTY_BACKING_FIELD name:xx type:IrErrorType visibility:public [final] 
                 EXPRESSION_BODY
-                  CALL 'public final fun plus (other: kotlin.Any?): kotlin.String declared in kotlin' type=kotlin.String origin=null
-                    other: ERROR_CALL 'Unresolved reference: <Unresolved name: y>#' type=IrErrorType
-              FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:<root>.test.<no name provided>) returnType:kotlin.String 
+                  ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/plus]>#' type=IrErrorType
+                    ERROR_CALL 'Unresolved reference: <Unresolved name: y>#' type=IrErrorType
+              FUN DEFAULT_PROPERTY_ACCESSOR name:<get-xx> visibility:public modality:FINAL <> ($this:<root>.test.<no name provided>) returnType:IrErrorType 
                 correspondingProperty: PROPERTY name:xx visibility:public modality:FINAL [val] 
                 $this: VALUE_PARAMETER name:<this> type:<root>.test.<no name provided> 
                 BLOCK_BODY
-                  RETURN type=kotlin.Nothing from='public final fun <get-xx> (): kotlin.String declared in <root>.test.<no name provided>'
-                    GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:kotlin.String visibility:public [final] ' type=kotlin.String origin=null
+                  RETURN type=kotlin.Nothing from='public final fun <get-xx> (): IrErrorType declared in <root>.test.<no name provided>'
+                    GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:xx type:IrErrorType visibility:public [final] ' type=IrErrorType origin=null
                       receiver: GET_VAR '<this>: <root>.test.<no name provided> declared in <root>.test.<no name provided>.<get-xx>' type=<root>.test.<no name provided> origin=null
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=null
diff --git a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt
index e9d3ec4c35b..6c7560dee00 100644
--- a/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt
+++ b/compiler/testData/ir/irText/expressions/thisReferenceBeforeClassDeclared.fir.txt
@@ -1,24 +1,24 @@
 FILE fqName:<root> fileName:/thisReferenceBeforeClassDeclared.kt
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:test1 type:IrErrorType [val] 
+      VAR name:test1 type:<root>.WithCompanion [val] 
         BLOCK type=<root>.test.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.WithCompanion]
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:<root>.WithCompanion [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (a: <root>.WithCompanion.Companion) [primary] declared in <root>.WithCompanion'
                   a: ERROR_CALL 'Unresolved reference: this#' type=<root>.WithCompanion
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.WithCompanion]'
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=null
-      VAR name:test2 type:IrErrorType [val] 
+      VAR name:test2 type:<root>.WithCompanion [val] 
         BLOCK type=<root>.test.<no name provided> origin=OBJECT_LITERAL
           CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.WithCompanion]
             $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.test.<no name provided> 
-            CONSTRUCTOR visibility:private <> () returnType:IrErrorType [primary] 
+            CONSTRUCTOR visibility:private <> () returnType:<root>.WithCompanion [primary] 
               BLOCK_BODY
                 DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (a: <root>.WithCompanion.Companion) [primary] declared in <root>.WithCompanion'
-                  a: ERROR_CALL 'Unresolved reference: <Unresolved name: foo>#' type=IrErrorType
+                  a: CALL 'public final fun foo (): <root>.WithCompanion.Companion declared in <root>.WithCompanion.Companion' type=<root>.WithCompanion.Companion origin=null
                 INSTANCE_INITIALIZER_CALL classDescriptor='CLASS OBJECT name:<no name provided> modality:FINAL visibility:local superTypes:[<root>.WithCompanion]'
           CONSTRUCTOR_CALL 'private constructor <init> () [primary] declared in <root>.test.<no name provided>' type=<root>.test.<no name provided> origin=null
   CLASS CLASS name:WithCompanion modality:OPEN visibility:public superTypes:[kotlin.Any]
@@ -65,3 +65,4 @@ FILE fqName:<root> fileName:/thisReferenceBeforeClassDeclared.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/throw.fir.txt b/compiler/testData/ir/irText/expressions/throw.fir.txt
index b14cc54a368..ab6045fc60e 100644
--- a/compiler/testData/ir/irText/expressions/throw.fir.txt
+++ b/compiler/testData/ir/irText/expressions/throw.fir.txt
@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/throw.kt
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
       THROW type=kotlin.Nothing
-        ERROR_CALL 'Unresolved reference: <Unresolved name: Throwable>#' type=IrErrorType
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in kotlin.Throwable' type=kotlin.Throwable origin=null
   FUN name:testImplicitCast visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.Unit 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -12,3 +12,4 @@ FILE fqName:<root> fileName:/throw.kt
             GET_VAR 'a: kotlin.Any declared in <root>.testImplicitCast' type=kotlin.Any origin=null
           then: THROW type=kotlin.Nothing
             GET_VAR 'a: kotlin.Any declared in <root>.testImplicitCast' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/tryCatch.fir.txt b/compiler/testData/ir/irText/expressions/tryCatch.fir.txt
index 0483e742313..ffbe1959602 100644
--- a/compiler/testData/ir/irText/expressions/tryCatch.fir.txt
+++ b/compiler/testData/ir/irText/expressions/tryCatch.fir.txt
@@ -22,3 +22,4 @@ FILE fqName:<root> fileName:/tryCatch.kt
           finally: BLOCK type=kotlin.Int origin=null
             CALL 'public final fun println (): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
             CONST Int type=kotlin.Int value=555
+
diff --git a/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.fir.txt b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.fir.txt
index 2b7e09caea9..4a12f28dab9 100644
--- a/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.fir.txt
+++ b/compiler/testData/ir/irText/expressions/tryCatchWithImplicitCast.fir.txt
@@ -14,3 +14,4 @@ FILE fqName:<root> fileName:/tryCatchWithImplicitCast.kt
           CATCH parameter=val e: kotlin.Throwable [val] declared in <root>.testImplicitCast
             VAR name:e type:kotlin.Throwable [val] 
             CONST String type=kotlin.String value=""
+
diff --git a/compiler/testData/ir/irText/expressions/typeArguments.fir.txt b/compiler/testData/ir/irText/expressions/typeArguments.fir.txt
index ca7a10dc9d8..e8071b8486b 100644
--- a/compiler/testData/ir/irText/expressions/typeArguments.fir.txt
+++ b/compiler/testData/ir/irText/expressions/typeArguments.fir.txt
@@ -7,7 +7,8 @@ FILE fqName:<root> fileName:/typeArguments.kt
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.Array<*>
               GET_VAR 'x: kotlin.Any declared in <root>.test1' type=kotlin.Any origin=null
-            then: CALL 'public final fun isArrayOf (): kotlin.Boolean declared in kotlin.jvm' type=kotlin.Boolean origin=null
+            then: ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/jvm/isArrayOf]>#' type=IrErrorType
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
             then: CONST Boolean type=kotlin.Boolean value=false
+
diff --git a/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.fir.txt b/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.fir.txt
index cd1af561bd6..2bd9f85894e 100644
--- a/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.fir.txt
+++ b/compiler/testData/ir/irText/expressions/typeParameterClassLiteral.fir.txt
@@ -1,22 +1,22 @@
 FILE fqName:<root> fileName:/typeParameterClassLiteral.kt
-  FUN name:classRefFun visibility:public modality:FINAL <T> () returnType:IrErrorType [inline] 
+  FUN name:classRefFun visibility:public modality:FINAL <T> () returnType:kotlin.reflect.KClass<IrErrorType> [inline] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun classRefFun <T> (): IrErrorType [inline] declared in <root>'
-        GET_CLASS type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun classRefFun <T> (): kotlin.reflect.KClass<IrErrorType> [inline] declared in <root>'
+        GET_CLASS type=kotlin.reflect.KClass<IrErrorType>
           ERROR_CALL 'Unresolved reference: <Unresolved name: T>#' type=IrErrorType
-  FUN name:classRefExtFun visibility:public modality:FINAL <T> () returnType:IrErrorType [inline] 
+  FUN name:classRefExtFun visibility:public modality:FINAL <T> () returnType:kotlin.reflect.KClass<IrErrorType> [inline] 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun classRefExtFun <T> (): IrErrorType [inline] declared in <root>'
-        GET_CLASS type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun classRefExtFun <T> (): kotlin.reflect.KClass<IrErrorType> [inline] declared in <root>'
+        GET_CLASS type=kotlin.reflect.KClass<IrErrorType>
           ERROR_CALL 'Unresolved reference: <Unresolved name: T>#' type=IrErrorType
   PROPERTY name:classRefExtVal visibility:public modality:FINAL [val] 
     FUN name:<get-classRefExtVal> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:classRefExtVal visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-classRefExtVal> (): IrErrorType declared in <root>'
-          GET_CLASS type=IrErrorType
+          GET_CLASS type=kotlin.reflect.KClass<IrErrorType>
             ERROR_CALL 'Unresolved reference: <Unresolved name: T>#' type=IrErrorType
   CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Host 
@@ -24,19 +24,19 @@ FILE fqName:<root> fileName:/typeParameterClassLiteral.kt
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Host modality:FINAL visibility:public superTypes:[kotlin.Any]'
-    FUN name:classRefGenericMemberFun visibility:public modality:FINAL <TF> ($this:<root>.Host) returnType:IrErrorType [inline] 
+    FUN name:classRefGenericMemberFun visibility:public modality:FINAL <TF> ($this:<root>.Host) returnType:kotlin.reflect.KClass<IrErrorType> [inline] 
       TYPE_PARAMETER name:TF index:0 variance: superTypes:[]
       $this: VALUE_PARAMETER name:<this> type:<root>.Host 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun classRefGenericMemberFun <TF> (): IrErrorType [inline] declared in <root>.Host'
-          GET_CLASS type=IrErrorType
+        RETURN type=kotlin.Nothing from='public final fun classRefGenericMemberFun <TF> (): kotlin.reflect.KClass<IrErrorType> [inline] declared in <root>.Host'
+          GET_CLASS type=kotlin.reflect.KClass<IrErrorType>
             ERROR_CALL 'Unresolved reference: <Unresolved name: TF>#' type=IrErrorType
-    FUN name:classRefGenericMemberExtFun visibility:public modality:FINAL <TF> ($this:<root>.Host) returnType:IrErrorType [inline] 
+    FUN name:classRefGenericMemberExtFun visibility:public modality:FINAL <TF> ($this:<root>.Host) returnType:kotlin.reflect.KClass<IrErrorType> [inline] 
       TYPE_PARAMETER name:TF index:0 variance: superTypes:[]
       $this: VALUE_PARAMETER name:<this> type:<root>.Host 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun classRefGenericMemberExtFun <TF> (): IrErrorType [inline] declared in <root>.Host'
-          GET_CLASS type=IrErrorType
+        RETURN type=kotlin.Nothing from='public final fun classRefGenericMemberExtFun <TF> (): kotlin.reflect.KClass<IrErrorType> [inline] declared in <root>.Host'
+          GET_CLASS type=kotlin.reflect.KClass<IrErrorType>
             ERROR_CALL 'Unresolved reference: <Unresolved name: TF>#' type=IrErrorType
     PROPERTY name:classRefGenericMemberExtVal visibility:public modality:FINAL [val] 
       FUN name:<get-classRefGenericMemberExtVal> visibility:public modality:FINAL <> ($this:<root>.Host) returnType:IrErrorType 
@@ -44,7 +44,7 @@ FILE fqName:<root> fileName:/typeParameterClassLiteral.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.Host 
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-classRefGenericMemberExtVal> (): IrErrorType declared in <root>.Host'
-            GET_CLASS type=IrErrorType
+            GET_CLASS type=kotlin.reflect.KClass<IrErrorType>
               ERROR_CALL 'Unresolved reference: <Unresolved name: TV>#' type=IrErrorType
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
@@ -59,3 +59,4 @@ FILE fqName:<root> fileName:/typeParameterClassLiteral.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.fir.txt b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.fir.txt
index 32079309792..2342639c789 100644
--- a/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.fir.txt
+++ b/compiler/testData/ir/irText/expressions/unsignedIntegerLiterals.fir.txt
@@ -54,38 +54,39 @@ FILE fqName:<root> fileName:/unsignedIntegerLiterals.kt
         RETURN type=kotlin.Nothing from='public final fun <get-testULongWithExpectedType> (): kotlin.ULong declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testULongWithExpectedType type:kotlin.ULong visibility:public [final,static] ' type=kotlin.ULong origin=null
   PROPERTY name:testToUByte visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:testToUByte type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: toUByte, [kotlin/toUByte, kotlin/toUByte, kotlin/toUByte, kotlin/toUByte, kotlin/text/toUByte]>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToUByte> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun toUByte (): kotlin.UByte [inline] declared in kotlin' type=kotlin.UByte origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToUByte> visibility:public modality:FINAL <> () returnType:kotlin.UByte 
       correspondingProperty: PROPERTY name:testToUByte visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testToUByte> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUByte type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-testToUByte> (): kotlin.UByte declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUByte type:kotlin.UByte visibility:public [final,static] ' type=kotlin.UByte origin=null
   PROPERTY name:testToUShort visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:testToUShort type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: toUShort, [kotlin/toUShort, kotlin/toUShort, kotlin/toUShort, kotlin/toUShort, kotlin/text/toUShort]>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToUShort> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun toUShort (): kotlin.UShort [inline] declared in kotlin' type=kotlin.UShort origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToUShort> visibility:public modality:FINAL <> () returnType:kotlin.UShort 
       correspondingProperty: PROPERTY name:testToUShort visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testToUShort> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUShort type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-testToUShort> (): kotlin.UShort declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUShort type:kotlin.UShort visibility:public [final,static] ' type=kotlin.UShort origin=null
   PROPERTY name:testToUInt visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:testToUInt type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: toUInt, [kotlin/toUInt, kotlin/toUInt, kotlin/toUInt, kotlin/toUInt, kotlin/toUInt, kotlin/toUInt, kotlin/text/toUInt]>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToUInt> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun toUInt (): kotlin.UInt [inline] declared in kotlin' type=kotlin.UInt origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToUInt> visibility:public modality:FINAL <> () returnType:kotlin.UInt 
       correspondingProperty: PROPERTY name:testToUInt visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testToUInt> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUInt type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-testToUInt> (): kotlin.UInt declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToUInt type:kotlin.UInt visibility:public [final,static] ' type=kotlin.UInt origin=null
   PROPERTY name:testToULong visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:testToULong type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: toULong, [kotlin/toULong, kotlin/toULong, kotlin/toULong, kotlin/toULong, kotlin/toULong, kotlin/toULong, kotlin/text/toULong]>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToULong> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun toULong (): kotlin.ULong [inline] declared in kotlin' type=kotlin.ULong origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-testToULong> visibility:public modality:FINAL <> () returnType:kotlin.ULong 
       correspondingProperty: PROPERTY name:testToULong visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-testToULong> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToULong type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-testToULong> (): kotlin.ULong declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:testToULong type:kotlin.ULong visibility:public [final,static] ' type=kotlin.ULong origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt b/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt
index 81cf5b3d580..25e241d0361 100644
--- a/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt
+++ b/compiler/testData/ir/irText/expressions/useImportedMember.fir.txt
@@ -144,8 +144,8 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
             $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Ambiguity: f, [/C.f, /C.f]>#' type=IrErrorType
-                CONST Int type=kotlin.Int value=1
+              arg0: CALL 'public final fun f (s: kotlin.Int): kotlin.Int declared in <root>.C' type=kotlin.Int origin=null
+                s: CONST Int type=kotlin.Int value=1
               arg1: CONST Int type=kotlin.String value=1
           then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
             CONST String type=kotlin.String value="1"
@@ -153,8 +153,8 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
             $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Ambiguity: f, [/C.f, /C.f]>#' type=IrErrorType
-                CONST String type=kotlin.String value="s"
+              arg0: CALL 'public final fun f (s: kotlin.String): kotlin.Int declared in <root>.C' type=kotlin.Int origin=null
+                s: CONST String type=kotlin.String value="s"
               arg1: CONST Int type=kotlin.String value=2
           then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
             CONST String type=kotlin.String value="2"
@@ -196,7 +196,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
             $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-              arg0: CALL 'public final fun g1 <T> (t: T of <root>.C.g1): T of <root>.C.g1 declared in <root>.C' type=T of <root>.C.g1 origin=null
+              arg0: CALL 'public final fun g1 <T> (t: T of <root>.C.g1): T of <root>.C.g1 declared in <root>.C' type=kotlin.String origin=null
                 <T>: <none>
                 t: CONST String type=kotlin.String value="7"
               arg1: CONST String type=kotlin.String value="7"
@@ -222,7 +222,7 @@ FILE fqName:<root> fileName:/useImportedMember.kt
         BRANCH
           if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
             $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-              arg0: ERROR_CALL 'Unresolved reference: <Unresolved name: fromClass>#' type=IrErrorType
+              arg0: CALL 'public final fun <get-fromClass> (): T of <uninitialized parent> declared in <root>.BaseClass' type=T of <uninitialized parent> origin=null
               arg1: CONST String type=kotlin.String value="10"
           then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
             CONST String type=kotlin.String value="10"
@@ -237,3 +237,4 @@ FILE fqName:<root> fileName:/useImportedMember.kt
             CONST String type=kotlin.String value="11"
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK"
+
diff --git a/compiler/testData/ir/irText/expressions/values.fir.txt b/compiler/testData/ir/irText/expressions/values.fir.txt
index d42ce10a951..eb949a91917 100644
--- a/compiler/testData/ir/irText/expressions/values.fir.txt
+++ b/compiler/testData/ir/irText/expressions/values.fir.txt
@@ -112,19 +112,20 @@ FILE fqName:<root> fileName:/values.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:test1 visibility:public modality:FINAL <> () returnType:IrErrorType 
+  FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Any 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
-  FUN name:test2 visibility:public modality:FINAL <> () returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Any declared in <root>'
+        ERROR_CALL 'Unresolved reference: R|/Enum.A|' type=kotlin.Any
+  FUN name:test2 visibility:public modality:FINAL <> () returnType:<root>.A 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.A declared in <root>'
+        ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Int 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (): kotlin.Int declared in <root>'
         CALL 'public final fun <get-a> (): kotlin.Int declared in <root>' type=kotlin.Int origin=null
-  FUN name:test4 visibility:public modality:FINAL <> () returnType:IrErrorType 
+  FUN name:test4 visibility:public modality:FINAL <> () returnType:<root>.Z 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test4 (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Unresolved name: Z>#' type=IrErrorType
+      RETURN type=kotlin.Nothing from='public final fun test4 (): <root>.Z declared in <root>'
+        ERROR_CALL 'Unresolved reference: R|/Z|' type=<root>.Z
+
diff --git a/compiler/testData/ir/irText/expressions/vararg.fir.txt b/compiler/testData/ir/irText/expressions/vararg.fir.txt
index 11dc7579c3f..50663712338 100644
--- a/compiler/testData/ir/irText/expressions/vararg.fir.txt
+++ b/compiler/testData/ir/irText/expressions/vararg.fir.txt
@@ -1,35 +1,36 @@
 FILE fqName:<root> fileName:/vararg.kt
   PROPERTY name:test1 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array<T of <uninitialized parent>> visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array<kotlin.String> visibility:public [final,static] 
       EXPRESSION_BODY
-        CALL 'public final fun arrayOf (elements: kotlin.Array<out T of <uninitialized parent>>): kotlin.Array<T of <uninitialized parent>> [inline] declared in kotlin' type=kotlin.Array<T of <uninitialized parent>> origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Array<T of <uninitialized parent>> 
+        CALL 'public final fun arrayOf (elements: kotlin.Array<out T of <uninitialized parent>>): kotlin.Array<T of <uninitialized parent>> [inline] declared in kotlin' type=kotlin.Array<kotlin.String> origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:kotlin.Array<kotlin.String> 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Array<T of <uninitialized parent>> declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array<T of <uninitialized parent>> visibility:public [final,static] ' type=kotlin.Array<T of <uninitialized parent>> origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test1> (): kotlin.Array<kotlin.String> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test1 type:kotlin.Array<kotlin.String> visibility:public [final,static] ' type=kotlin.Array<kotlin.String> origin=null
   PROPERTY name:test2 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array<T of <uninitialized parent>> visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array<kotlin.String> visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Cannot bind 3 arguments to arrayOf call with 1 parameters' type=kotlin.Array<T of <uninitialized parent>>
+        ERROR_CALL 'Cannot bind 3 arguments to arrayOf call with 1 parameters' type=kotlin.Array<kotlin.String>
           CONST String type=kotlin.String value="1"
           CONST String type=kotlin.String value="2"
           CONST String type=kotlin.String value="3"
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Array<T of <uninitialized parent>> 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:kotlin.Array<kotlin.String> 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Array<T of <uninitialized parent>> declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array<T of <uninitialized parent>> visibility:public [final,static] ' type=kotlin.Array<T of <uninitialized parent>> origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test2> (): kotlin.Array<kotlin.String> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:kotlin.Array<kotlin.String> visibility:public [final,static] ' type=kotlin.Array<kotlin.String> origin=null
   PROPERTY name:test3 visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array<T of <uninitialized parent>> visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array<kotlin.String> visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Cannot bind 4 arguments to arrayOf call with 1 parameters' type=kotlin.Array<T of <uninitialized parent>>
+        ERROR_CALL 'Cannot bind 4 arguments to arrayOf call with 1 parameters' type=kotlin.Array<kotlin.String>
           CONST String type=kotlin.String value="0"
-          CALL 'public final fun <get-test2> (): kotlin.Array<T of <uninitialized parent>> declared in <root>' type=kotlin.Array<T of <uninitialized parent>> origin=null
-          CALL 'public final fun <get-test1> (): kotlin.Array<T of <uninitialized parent>> declared in <root>' type=kotlin.Array<T of <uninitialized parent>> origin=null
+          CALL 'public final fun <get-test2> (): kotlin.Array<kotlin.String> declared in <root>' type=kotlin.Array<kotlin.String> origin=null
+          CALL 'public final fun <get-test1> (): kotlin.Array<kotlin.String> declared in <root>' type=kotlin.Array<kotlin.String> origin=null
           CONST String type=kotlin.String value="4"
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.Array<T of <uninitialized parent>> 
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test3> visibility:public modality:FINAL <> () returnType:kotlin.Array<kotlin.String> 
       correspondingProperty: PROPERTY name:test3 visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test3> (): kotlin.Array<T of <uninitialized parent>> declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array<T of <uninitialized parent>> visibility:public [final,static] ' type=kotlin.Array<T of <uninitialized parent>> origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test3> (): kotlin.Array<kotlin.String> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test3 type:kotlin.Array<kotlin.String> visibility:public [final,static] ' type=kotlin.Array<kotlin.String> origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/varargWithImplicitCast.fir.txt b/compiler/testData/ir/irText/expressions/varargWithImplicitCast.fir.txt
index 850f1990eef..bc6851c82c0 100644
--- a/compiler/testData/ir/irText/expressions/varargWithImplicitCast.fir.txt
+++ b/compiler/testData/ir/irText/expressions/varargWithImplicitCast.fir.txt
@@ -9,8 +9,8 @@ FILE fqName:<root> fileName:/varargWithImplicitCast.kt
           then: RETURN type=kotlin.Nothing from='public final fun testScalar (a: kotlin.Any): kotlin.IntArray declared in <root>'
             CALL 'public final fun intArrayOf (elements: kotlin.IntArray): kotlin.IntArray declared in kotlin' type=kotlin.IntArray origin=null
       RETURN type=kotlin.Nothing from='public final fun testScalar (a: kotlin.Any): kotlin.IntArray declared in <root>'
-        CALL 'public final fun intArrayOf (elements: kotlin.IntArray): kotlin.IntArray declared in kotlin' type=kotlin.IntArray origin=null
-          elements: GET_VAR 'a: kotlin.Any declared in <root>.testScalar' type=kotlin.Any origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/intArrayOf]>#' type=IrErrorType
+          GET_VAR 'a: kotlin.Any declared in <root>.testScalar' type=kotlin.Any origin=null
   FUN name:testSpread visibility:public modality:FINAL <> (a:kotlin.Any) returnType:kotlin.IntArray 
     VALUE_PARAMETER name:a index:0 type:kotlin.Any 
     BLOCK_BODY
@@ -21,5 +21,6 @@ FILE fqName:<root> fileName:/varargWithImplicitCast.kt
           then: RETURN type=kotlin.Nothing from='public final fun testSpread (a: kotlin.Any): kotlin.IntArray declared in <root>'
             CALL 'public final fun intArrayOf (elements: kotlin.IntArray): kotlin.IntArray declared in kotlin' type=kotlin.IntArray origin=null
       RETURN type=kotlin.Nothing from='public final fun testSpread (a: kotlin.Any): kotlin.IntArray declared in <root>'
-        CALL 'public final fun intArrayOf (elements: kotlin.IntArray): kotlin.IntArray declared in kotlin' type=kotlin.IntArray origin=null
-          elements: GET_VAR 'a: kotlin.Any declared in <root>.testSpread' type=kotlin.Any origin=null
+        ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [kotlin/intArrayOf]>#' type=IrErrorType
+          GET_VAR 'a: kotlin.Any declared in <root>.testSpread' type=kotlin.Any origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt
index 3c1d8a96fa6..0f99748cec0 100644
--- a/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt
+++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCall.fir.txt
@@ -1,30 +1,30 @@
 FILE fqName:<root> fileName:/variableAsFunctionCall.kt
-  FUN name:k visibility:public modality:FINAL <> () returnType:kotlin.Function0 
+  FUN name:k visibility:public modality:FINAL <> () returnType:kotlin.Function0<kotlin.String> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun k (): kotlin.Function0 declared in <root>'
-        BLOCK type=kotlin.Function0 origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function0 
+      RETURN type=kotlin.Nothing from='public final fun k (): kotlin.Function0<kotlin.String> declared in <root>'
+        BLOCK type=kotlin.Function0<kotlin.String> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function0<kotlin.String> 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Function0 declared in <root>.k'
-                ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function0 declared in <root>.k' type=kotlin.Function0 origin=LAMBDA
-  FUN name:test1 visibility:public modality:FINAL <> (f:kotlin.Function0) returnType:IrErrorType 
-    VALUE_PARAMETER name:f index:0 type:kotlin.Function0 
+              ERROR_CALL 'Unresolved reference: this#' type=kotlin.String
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function0<kotlin.String> declared in <root>.k' type=kotlin.Function0<kotlin.String> origin=LAMBDA
+  FUN name:test1 visibility:public modality:FINAL <> (f:kotlin.Function0<kotlin.Unit>) returnType:IrErrorType 
+    VALUE_PARAMETER name:f index:0 type:kotlin.Function0<kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (f: kotlin.Function0): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test1 (f: kotlin.Function0<kotlin.Unit>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: f>#' type=IrErrorType
-  FUN name:test2 visibility:public modality:FINAL <> (f:kotlin.Function1) returnType:IrErrorType 
-    VALUE_PARAMETER name:f index:0 type:kotlin.Function1 
+  FUN name:test2 visibility:public modality:FINAL <> (f:kotlin.Function1<kotlin.String, kotlin.Unit>) returnType:IrErrorType 
+    VALUE_PARAMETER name:f index:0 type:kotlin.Function1<kotlin.String, kotlin.Unit> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (f: kotlin.Function1): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun test2 (f: kotlin.Function1<kotlin.String, kotlin.Unit>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: f>#' type=IrErrorType
   FUN name:test3 visibility:public modality:FINAL <> () returnType:IrErrorType 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test3 (): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: invoke>#' type=IrErrorType
-          CALL 'public final fun k (): kotlin.Function0 declared in <root>' type=kotlin.Function0 origin=null
+          CALL 'public final fun k (): kotlin.Function0<kotlin.String> declared in <root>' type=kotlin.Function0<kotlin.String> origin=null
   FUN name:test4 visibility:public modality:FINAL <> (ns:kotlin.String?) returnType:IrErrorType 
     VALUE_PARAMETER name:ns index:0 type:kotlin.String? 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test4 (ns: kotlin.String?): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: invoke>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt b/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt
index 0a3b37a5f5c..13b1dfef20e 100644
--- a/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt
+++ b/compiler/testData/ir/irText/expressions/variableAsFunctionCallWithGenerics.fir.txt
@@ -1,32 +1,32 @@
 FILE fqName:<root> fileName:/variableAsFunctionCallWithGenerics.kt
   PROPERTY name:gk visibility:public modality:FINAL [val] 
-    FUN name:<get-gk> visibility:public modality:FINAL <> () returnType:kotlin.Function0 
+    FUN name:<get-gk> visibility:public modality:FINAL <> () returnType:kotlin.Function0<T of <uninitialized parent>> 
       correspondingProperty: PROPERTY name:gk visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-gk> (): kotlin.Function0 declared in <root>'
-          BLOCK type=kotlin.Function0 origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function0 
+        RETURN type=kotlin.Nothing from='public final fun <get-gk> (): kotlin.Function0<T of <uninitialized parent>> declared in <root>'
+          BLOCK type=kotlin.Function0<T of <uninitialized parent>> origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Function0<T of <uninitialized parent>> 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Function0 declared in <root>.<get-gk>'
-                  ERROR_CALL 'Unresolved reference: this#' type=IrErrorType
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function0 declared in <root>.<get-gk>' type=kotlin.Function0 origin=LAMBDA
+                ERROR_CALL 'Unresolved reference: this#' type=IrErrorType
+            FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Function0<T of <uninitialized parent>> declared in <root>.<get-gk>' type=kotlin.Function0<T of <uninitialized parent>> origin=LAMBDA
   FUN name:testGeneric1 visibility:public modality:FINAL <> (x:kotlin.String) returnType:IrErrorType 
     VALUE_PARAMETER name:x index:0 type:kotlin.String 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun testGeneric1 (x: kotlin.String): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: gk>#' type=IrErrorType
   PROPERTY name:kt26531Val visibility:public modality:FINAL [val] 
-    FUN name:<get-kt26531Val> visibility:public modality:FINAL <> () returnType:kotlin.Function0 
+    FUN name:<get-kt26531Val> visibility:public modality:FINAL <> () returnType:kotlin.Function0<T of <uninitialized parent>> 
       correspondingProperty: PROPERTY name:kt26531Val visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-kt26531Val> (): kotlin.Function0 declared in <root>'
-          BLOCK type=kotlin.Function0 origin=ANONYMOUS_FUNCTION
-            FUN name:<no name provided> visibility:local modality:FINAL <> () returnType:kotlin.Function0 
+        RETURN type=kotlin.Nothing from='public final fun <get-kt26531Val> (): kotlin.Function0<T of <uninitialized parent>> declared in <root>'
+          BLOCK type=kotlin.Function0<T of <uninitialized parent>> origin=ANONYMOUS_FUNCTION
+            FUN name:<no name provided> visibility:local modality:FINAL <> () returnType:kotlin.Function0<T of <uninitialized parent>> 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <no name provided> (): kotlin.Function0 declared in <root>.<get-kt26531Val>'
+                RETURN type=kotlin.Nothing from='local final fun <no name provided> (): kotlin.Function0<T of <uninitialized parent>> declared in <root>.<get-kt26531Val>'
                   ERROR_CALL 'Unresolved reference: this#' type=IrErrorType
-            FUNCTION_REFERENCE 'local final fun <no name provided> (): kotlin.Function0 declared in <root>.<get-kt26531Val>' type=kotlin.Function0 origin=ANONYMOUS_FUNCTION
+            FUNCTION_REFERENCE 'local final fun <no name provided> (): kotlin.Function0<T of <uninitialized parent>> declared in <root>.<get-kt26531Val>' type=kotlin.Function0<T of <uninitialized parent>> origin=ANONYMOUS_FUNCTION
   FUN name:kt26531 visibility:public modality:FINAL <> () returnType:IrErrorType 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun kt26531 (): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: kt26531Val>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/expressions/when.fir.txt b/compiler/testData/ir/irText/expressions/when.fir.txt
index 021f016c452..3ebe9196e02 100644
--- a/compiler/testData/ir/irText/expressions/when.fir.txt
+++ b/compiler/testData/ir/irText/expressions/when.fir.txt
@@ -33,7 +33,7 @@ FILE fqName:<root> fileName:/when.kt
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val tmp0_subject: kotlin.Any? [val] declared in <root>.testWithSubject' type=kotlin.Any? origin=null
-                arg1: ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
+                arg1: ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
               then: CONST String type=kotlin.String value="A"
             BRANCH
               if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String
@@ -44,7 +44,7 @@ FILE fqName:<root> fileName:/when.kt
                 GET_VAR 'val tmp0_subject: kotlin.Any? [val] declared in <root>.testWithSubject' type=kotlin.Any? origin=null
               then: CONST String type=kotlin.String value="!Number"
             BRANCH
-              if: CALL 'public abstract fun contains (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.Set' type=kotlin.Boolean origin=null
+              if: CALL 'public final fun contains (element: T of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections' type=kotlin.Boolean origin=null
                 element: GET_VAR 'val tmp0_subject: kotlin.Any? [val] declared in <root>.testWithSubject' type=kotlin.Any? origin=null
               then: CONST String type=kotlin.String value="nothingness?"
             BRANCH
@@ -63,7 +63,7 @@ FILE fqName:<root> fileName:/when.kt
           BRANCH
             if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
               arg0: GET_VAR 'x: kotlin.Any? declared in <root>.test' type=kotlin.Any? origin=null
-              arg1: ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
+              arg1: ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
             then: CONST String type=kotlin.String value="A"
           BRANCH
             if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String
@@ -74,7 +74,7 @@ FILE fqName:<root> fileName:/when.kt
               GET_VAR 'x: kotlin.Any? declared in <root>.test' type=kotlin.Any? origin=null
             then: CONST String type=kotlin.String value="!Number"
           BRANCH
-            if: CALL 'public abstract fun contains (element: E of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections.Set' type=kotlin.Boolean origin=null
+            if: CALL 'public final fun contains (element: T of <uninitialized parent>): kotlin.Boolean declared in kotlin.collections' type=kotlin.Boolean origin=null
               element: GET_VAR 'x: kotlin.Any? declared in <root>.test' type=kotlin.Any? origin=null
             then: CONST String type=kotlin.String value="nothingness?"
           BRANCH
@@ -153,3 +153,4 @@ FILE fqName:<root> fileName:/when.kt
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: CONST String type=kotlin.String value="?"
+
diff --git a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt
index 703df129acb..6ba966a26e8 100644
--- a/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt
+++ b/compiler/testData/ir/irText/expressions/whenCoercedToUnit.fir.txt
@@ -10,3 +10,4 @@ FILE fqName:<root> fileName:/whenCoercedToUnit.kt
               arg0: GET_VAR 'val tmp0_subject: kotlin.Int [val] declared in <root>.foo' type=kotlin.Int origin=null
               arg1: CONST Int type=kotlin.Unit value=0
             then: CONST Int type=kotlin.Unit value=0
+
diff --git a/compiler/testData/ir/irText/expressions/whenReturn.fir.txt b/compiler/testData/ir/irText/expressions/whenReturn.fir.txt
index 95117329ffa..67c96c62482 100644
--- a/compiler/testData/ir/irText/expressions/whenReturn.fir.txt
+++ b/compiler/testData/ir/irText/expressions/whenReturn.fir.txt
@@ -35,3 +35,4 @@ FILE fqName:<root> fileName:/whenReturn.kt
               CONST String type=kotlin.String value="Failure"
       RETURN type=kotlin.Nothing from='public final fun toString (grade: kotlin.String): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="???"
+
diff --git a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt
index 4f355d92f6a..729bd1929ca 100644
--- a/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt
+++ b/compiler/testData/ir/irText/expressions/whenWithSubjectVariable.fir.txt
@@ -3,18 +3,18 @@ FILE fqName:<root> fileName:/whenWithSubjectVariable.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun foo (): kotlin.Any declared in <root>'
         CONST Int type=kotlin.Any value=1
-  FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Int 
+  FUN name:test visibility:public modality:FINAL <> () returnType:IrErrorType 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (): kotlin.Int declared in <root>'
-        BLOCK type=kotlin.Int origin=WHEN
+      RETURN type=kotlin.Nothing from='public final fun test (): IrErrorType declared in <root>'
+        BLOCK type=IrErrorType origin=WHEN
           VAR name:y type:kotlin.Any [val] 
             CALL 'public final fun foo (): kotlin.Any declared in <root>' type=kotlin.Any origin=null
-          WHEN type=kotlin.Int origin=WHEN
+          WHEN type=IrErrorType origin=WHEN
             BRANCH
               if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
                 arg0: GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
-                arg1: CONST Int type=kotlin.Int value=42
-              then: CONST Int type=kotlin.Int value=1
+                arg1: CONST Int type=IrErrorType value=42
+              then: CONST Int type=IrErrorType value=1
             BRANCH
               if: TYPE_OP type=kotlin.Boolean origin=INSTANCEOF typeOperand=kotlin.String
                 GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
@@ -22,15 +22,16 @@ FILE fqName:<root> fileName:/whenWithSubjectVariable.kt
             BRANCH
               if: TYPE_OP type=kotlin.Boolean origin=NOT_INSTANCEOF typeOperand=kotlin.Int
                 GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
-              then: CONST Int type=kotlin.Int value=2
+              then: CONST Int type=IrErrorType value=2
             BRANCH
-              if: ERROR_CALL 'Unresolved reference: <Unresolved name: contains>#' type=IrErrorType
-                GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
-              then: CONST Int type=kotlin.Int value=3
+              if: CALL 'public open fun contains (value: kotlin.Int): kotlin.Boolean declared in kotlin.ranges.IntRange' type=kotlin.Boolean origin=null
+                value: GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
+              then: CONST Int type=IrErrorType value=3
             BRANCH
-              if: ERROR_CALL 'Unresolved reference: <Unresolved name: contains>#' type=IrErrorType
-                GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
-              then: CONST Int type=kotlin.Int value=4
+              if: CALL 'public open fun contains (value: kotlin.Int): kotlin.Boolean declared in kotlin.ranges.IntRange' type=kotlin.Boolean origin=null
+                value: GET_VAR 'val y: kotlin.Any [val] declared in <root>.test' type=kotlin.Any origin=null
+              then: CONST Int type=IrErrorType value=4
             BRANCH
               if: CONST Boolean type=kotlin.Boolean value=true
               then: CALL 'public final fun unaryMinus (): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt b/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt
index 0b7f0044c96..ac39f5523ab 100644
--- a/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt
+++ b/compiler/testData/ir/irText/expressions/whileDoWhile.fir.txt
@@ -52,3 +52,4 @@ FILE fqName:<root> fileName:/whileDoWhile.kt
             DO_WHILE label=null origin=DO_WHILE_LOOP
               body: BLOCK type=kotlin.Unit origin=null
               condition: GET_VAR 'val a: kotlin.Any? [val] declared in <root>.testSmartcastInCondition' type=kotlin.Any? origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/anonymousFunction.fir.txt b/compiler/testData/ir/irText/lambdas/anonymousFunction.fir.txt
index 36344650311..e865caeb9c5 100644
--- a/compiler/testData/ir/irText/lambdas/anonymousFunction.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/anonymousFunction.fir.txt
@@ -12,3 +12,4 @@ FILE fqName:<root> fileName:/anonymousFunction.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-anonymous> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:anonymous type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt
index eefd9a07fc8..872b9aca973 100644
--- a/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/destructuringInLambda.fir.txt
@@ -29,6 +29,16 @@ FILE fqName:<root> fileName:/destructuringInLambda.kt
           RETURN type=kotlin.Nothing from='public final fun <get-y> (): kotlin.Int declared in <root>.A'
             GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:y type:kotlin.Int visibility:public [final] ' type=kotlin.Int origin=null
               receiver: GET_VAR '<this>: <root>.A declared in <root>.A.<get-y>' type=<root>.A origin=null
+    FUN name:component1 visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Int 
+      $this: VALUE_PARAMETER name:<this> type:<root>.A 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component1 (): kotlin.Int declared in <root>.A'
+          CALL 'public final fun <get-x> (): kotlin.Int declared in <root>.A' type=kotlin.Int origin=null
+    FUN name:component2 visibility:public modality:FINAL <> ($this:<root>.A) returnType:kotlin.Int 
+      $this: VALUE_PARAMETER name:<this> type:<root>.A 
+      BLOCK_BODY
+        RETURN type=kotlin.Nothing from='public final fun component2 (): kotlin.Int declared in <root>.A'
+          CALL 'public final fun <get-y> (): kotlin.Int declared in <root>.A' type=kotlin.Int origin=null
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -43,29 +53,28 @@ FILE fqName:<root> fileName:/destructuringInLambda.kt
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   PROPERTY name:fn visibility:public modality:FINAL [var] 
-    FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1 visibility:public [static] 
+    FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<<root>.A, kotlin.Int> visibility:public [static] 
       EXPRESSION_BODY
-        BLOCK type=kotlin.Function1 origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (<destruct>:IrErrorType) returnType:kotlin.Function1 
+        BLOCK type=kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (<destruct>:IrErrorType) returnType:kotlin.Function1<<root>.A, kotlin.Int> 
             VALUE_PARAMETER name:<destruct> index:0 type:IrErrorType 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (<destruct>: IrErrorType): kotlin.Function1 declared in <root>.fn'
-                BLOCK type=IrErrorType origin=null
-                  VAR name:_ type:IrErrorType [val] 
-                    ERROR_CALL 'Unresolved reference: <Unresolved name: component1>#' type=IrErrorType
-                  VAR name:y type:IrErrorType [val] 
-                    ERROR_CALL 'Unresolved reference: <Unresolved name: component2>#' type=IrErrorType
-                  ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
-                    GET_VAR 'val y: IrErrorType [val] declared in <root>.fn.<anonymous>' type=IrErrorType origin=null
-          FUNCTION_REFERENCE 'local final fun <anonymous> (<destruct>: IrErrorType): kotlin.Function1 declared in <root>.fn' type=kotlin.Function1 origin=LAMBDA
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-fn> visibility:public modality:FINAL <> () returnType:kotlin.Function1 
+              VAR name:_ type:IrErrorType [val] 
+                ERROR_CALL 'Unresolved reference: <Unresolved name: component1>#' type=IrErrorType
+              VAR name:y type:IrErrorType [val] 
+                ERROR_CALL 'Unresolved reference: <Unresolved name: component2>#' type=IrErrorType
+              ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
+                GET_VAR 'val y: IrErrorType [val] declared in <root>.fn.<anonymous>' type=IrErrorType origin=null
+          FUNCTION_REFERENCE 'local final fun <anonymous> (<destruct>: IrErrorType): kotlin.Function1<<root>.A, kotlin.Int> declared in <root>.fn' type=kotlin.Function1<<root>.A, kotlin.Int> origin=LAMBDA
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-fn> visibility:public modality:FINAL <> () returnType:kotlin.Function1<<root>.A, kotlin.Int> 
       correspondingProperty: PROPERTY name:fn visibility:public modality:FINAL [var] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-fn> (): kotlin.Function1 declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1 visibility:public [static] ' type=kotlin.Function1 origin=null
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<set-fn> visibility:public modality:FINAL <> (<set-?>:kotlin.Function1) returnType:kotlin.Unit 
+        RETURN type=kotlin.Nothing from='public final fun <get-fn> (): kotlin.Function1<<root>.A, kotlin.Int> declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<<root>.A, kotlin.Int> visibility:public [static] ' type=kotlin.Function1<<root>.A, kotlin.Int> origin=null
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<set-fn> visibility:public modality:FINAL <> (<set-?>:kotlin.Function1<<root>.A, kotlin.Int>) returnType:kotlin.Unit 
       correspondingProperty: PROPERTY name:fn visibility:public modality:FINAL [var] 
-      VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Function1 
+      VALUE_PARAMETER name:<set-?> index:0 type:kotlin.Function1<<root>.A, kotlin.Int> 
       BLOCK_BODY
-        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1 visibility:public [static] ' type=kotlin.Unit origin=null
-          value: GET_VAR '<set-?>: kotlin.Function1 declared in <root>.<set-fn>' type=kotlin.Function1 origin=null
+        SET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:fn type:kotlin.Function1<<root>.A, kotlin.Int> visibility:public [static] ' type=kotlin.Unit origin=null
+          value: GET_VAR '<set-?>: kotlin.Function1<<root>.A, kotlin.Int> declared in <root>.<set-fn>' type=kotlin.Function1<<root>.A, kotlin.Int> origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt b/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt
index 9437364ecac..380334791d4 100644
--- a/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/extensionLambda.fir.txt
@@ -1,11 +1,12 @@
 FILE fqName:<root> fileName:/extensionLambda.kt
-  FUN name:test1 visibility:public modality:FINAL <> () returnType:IrErrorType 
+  FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Int 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (): IrErrorType declared in <root>'
-        ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
-          BLOCK type=IrErrorType origin=LAMBDA
-            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      RETURN type=kotlin.Nothing from='public final fun test1 (): kotlin.Int declared in <root>'
+        CALL 'public final fun run (block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Int origin=null
+          block: BLOCK type=IrErrorType origin=LAMBDA
+            FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.String) returnType:kotlin.Int 
+              VALUE_PARAMETER name:it index:0 type:kotlin.String 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                  ERROR_CALL 'Unresolved reference: <Unresolved name: length>#' type=IrErrorType
-            FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test1' type=IrErrorType origin=LAMBDA
+                ERROR_CALL 'No getter found for R|kotlin/String.length|' type=kotlin.Int
+            FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.String): kotlin.Int declared in <root>.test1' type=IrErrorType origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/lambdas/justLambda.fir.txt b/compiler/testData/ir/irText/lambdas/justLambda.fir.txt
index 4dbb4cc241b..75696e3548e 100644
--- a/compiler/testData/ir/irText/lambdas/justLambda.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/justLambda.fir.txt
@@ -5,8 +5,7 @@ FILE fqName:<root> fileName:/justLambda.kt
         BLOCK type=IrErrorType origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                CONST Int type=IrErrorType value=42
+              CONST Int type=IrErrorType value=42
           FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test1' type=IrErrorType origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test1> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:test1 visibility:public modality:FINAL [val] 
@@ -19,11 +18,11 @@ FILE fqName:<root> fileName:/justLambda.kt
         BLOCK type=IrErrorType origin=LAMBDA
           FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test2'
-                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+              GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
           FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test2' type=IrErrorType origin=LAMBDA
     FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test2> visibility:public modality:FINAL <> () returnType:IrErrorType 
       correspondingProperty: PROPERTY name:test2 visibility:public modality:FINAL [val] 
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test2> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test2 type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/localFunction.fir.txt b/compiler/testData/ir/irText/lambdas/localFunction.fir.txt
index 6b8887423ee..5734019191e 100644
--- a/compiler/testData/ir/irText/lambdas/localFunction.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/localFunction.fir.txt
@@ -10,3 +10,4 @@ FILE fqName:<root> fileName:/localFunction.kt
           ERROR_CALL 'Unresolved reference: R|<local>/x|' type=IrErrorType
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.outer.local' type=kotlin.Int origin=null
       CALL 'local final fun local (): kotlin.Unit declared in <local>' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt
index f7bbc8c161c..dcde57a855b 100644
--- a/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/multipleImplicitReceivers.fir.txt
@@ -45,7 +45,7 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.IFoo 
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public open fun <get-foo> (): <root>.B declared in <root>.IFoo'
-            ERROR_CALL 'Unresolved reference: <Unresolved name: B>#' type=IrErrorType
+            ERROR_CALL 'Unresolved reference: R|/B|' type=<root>.B
     FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
         public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
@@ -83,25 +83,26 @@ FILE fqName:<root> fileName:/multipleImplicitReceivers.kt
     VALUE_PARAMETER name:fooImpl index:0 type:<root>.IFoo 
     VALUE_PARAMETER name:invokeImpl index:1 type:<root>.IInvoke 
     BLOCK_BODY
-      CALL 'public final fun with (receiver: T of <uninitialized parent>, block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=R of <uninitialized parent> origin=null
-        receiver: ERROR_CALL 'Unresolved reference: <Unresolved name: A>#' type=IrErrorType
+      CALL 'public final fun with (receiver: T of <uninitialized parent>, block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+        receiver: ERROR_CALL 'Unresolved reference: R|/A|' type=<root>.A
         block: BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:<root>.A) returnType:kotlin.Nothing 
+            VALUE_PARAMETER name:it index:0 type:<root>.A 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test'
-                CALL 'public final fun with (receiver: T of <uninitialized parent>, block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=R of <uninitialized parent> origin=null
-                  receiver: GET_VAR 'fooImpl: <root>.IFoo declared in <root>.test' type=<root>.IFoo origin=null
-                  block: BLOCK type=IrErrorType origin=LAMBDA
-                    FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
-                      BLOCK_BODY
-                        RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test.<anonymous>'
-                          CALL 'public final fun with (receiver: T of <uninitialized parent>, block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=R of <uninitialized parent> origin=null
-                            receiver: GET_VAR 'invokeImpl: <root>.IInvoke declared in <root>.test' type=<root>.IInvoke origin=null
-                            block: BLOCK type=IrErrorType origin=LAMBDA
-                              FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
-                                BLOCK_BODY
-                                  RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test.<anonymous>.<anonymous>'
-                                    ERROR_CALL 'Unresolved reference: <Unresolved name: foo>#' type=IrErrorType
-                              FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test.<anonymous>.<anonymous>' type=IrErrorType origin=LAMBDA
-                    FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test.<anonymous>' type=IrErrorType origin=LAMBDA
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test' type=IrErrorType origin=LAMBDA
+              CALL 'public final fun with (receiver: T of <uninitialized parent>, block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+                receiver: GET_VAR 'fooImpl: <root>.IFoo declared in <root>.test' type=<root>.IFoo origin=null
+                block: BLOCK type=IrErrorType origin=LAMBDA
+                  FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:<root>.IFoo) returnType:kotlin.Nothing 
+                    VALUE_PARAMETER name:it index:0 type:<root>.IFoo 
+                    BLOCK_BODY
+                      CALL 'public final fun with (receiver: T of <uninitialized parent>, block: kotlin.Function1<T of <uninitialized parent>, R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+                        receiver: GET_VAR 'invokeImpl: <root>.IInvoke declared in <root>.test' type=<root>.IInvoke origin=null
+                        block: BLOCK type=IrErrorType origin=LAMBDA
+                          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:<root>.IInvoke) returnType:IrErrorType 
+                            VALUE_PARAMETER name:it index:0 type:<root>.IInvoke 
+                            BLOCK_BODY
+                              ERROR_CALL 'Unresolved reference: <Unresolved name: foo>#' type=IrErrorType
+                          FUNCTION_REFERENCE 'local final fun <anonymous> (it: <root>.IInvoke): IrErrorType declared in <root>.test.<anonymous>.<anonymous>' type=IrErrorType origin=LAMBDA
+                  FUNCTION_REFERENCE 'local final fun <anonymous> (it: <root>.IFoo): kotlin.Nothing declared in <root>.test.<anonymous>' type=IrErrorType origin=LAMBDA
+          FUNCTION_REFERENCE 'local final fun <anonymous> (it: <root>.A): kotlin.Nothing declared in <root>.test' type=IrErrorType origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/lambdas/nonLocalReturn.fir.txt b/compiler/testData/ir/irText/lambdas/nonLocalReturn.fir.txt
index da6c633ea7b..f573cadbea1 100644
--- a/compiler/testData/ir/irText/lambdas/nonLocalReturn.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/nonLocalReturn.fir.txt
@@ -1,85 +1,79 @@
 FILE fqName:<root> fileName:/nonLocalReturn.kt
   FUN name:test0 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public final fun run (block: kotlin.Function0<R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+        block: BLOCK type=IrErrorType origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test0'
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test0'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test0' type=IrErrorType origin=LAMBDA
+              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test0'
+                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test0' type=IrErrorType origin=LAMBDA
   FUN name:test1 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public final fun run (block: kotlin.Function0<R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+        block: BLOCK type=IrErrorType origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test1' type=IrErrorType origin=LAMBDA
+              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test1'
+                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test1' type=IrErrorType origin=LAMBDA
   FUN name:test2 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public final fun run (block: kotlin.Function0<R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+        block: BLOCK type=IrErrorType origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test2'
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test2'
-                  GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test2' type=IrErrorType origin=LAMBDA
+              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test2'
+                GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test2' type=IrErrorType origin=LAMBDA
   FUN name:test3 visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public final fun run (block: kotlin.Function0<R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+        block: BLOCK type=IrErrorType origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Nothing 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test3'
-                ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
-                  BLOCK type=IrErrorType origin=LAMBDA
-                    FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
-                      BLOCK_BODY
-                        RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test3.<anonymous>'
-                          RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test3.<anonymous>'
-                            GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-                    FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test3.<anonymous>' type=IrErrorType origin=LAMBDA
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test3' type=IrErrorType origin=LAMBDA
+              CALL 'public final fun run (block: kotlin.Function0<R of <uninitialized parent>>): R of <uninitialized parent> [inline] declared in kotlin' type=kotlin.Nothing origin=null
+                block: BLOCK type=IrErrorType origin=LAMBDA
+                  FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:kotlin.Unit 
+                    BLOCK_BODY
+                      RETURN type=kotlin.Nothing from='local final fun <anonymous> (): kotlin.Unit declared in <root>.test3.<anonymous>'
+                        GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+                  FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Unit declared in <root>.test3.<anonymous>' type=IrErrorType origin=LAMBDA
+          FUNCTION_REFERENCE 'local final fun <anonymous> (): kotlin.Nothing declared in <root>.test3' type=IrErrorType origin=LAMBDA
   FUN name:testLrmFoo1 visibility:public modality:FINAL <> (ints:kotlin.collections.List<kotlin.Int>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:ints index:0 type:kotlin.collections.List<kotlin.Int> 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: forEach, [kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/sequences/forEach, kotlin/text/forEach]>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public final fun forEach (action: kotlin.Function1<T of <uninitialized parent>, kotlin.Unit>): kotlin.Unit [inline] declared in kotlin.collections' type=kotlin.Unit origin=null
+        action: BLOCK type=kotlin.Unit origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Unit 
+            VALUE_PARAMETER name:it index:0 type:kotlin.Int 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.testLrmFoo1'
-                BLOCK type=IrErrorType origin=null
-                  WHEN type=kotlin.Unit origin=IF
-                    BRANCH
-                      if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                        arg0: ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
-                        arg1: CONST Int type=kotlin.Int value=0
-                      then: RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.testLrmFoo1'
-                        GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-                  ERROR_CALL 'Unresolved reference: <Ambiguity: print, [kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print]>#' type=IrErrorType
-                    ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.testLrmFoo1' type=IrErrorType origin=LAMBDA
+              WHEN type=kotlin.Unit origin=IF
+                BRANCH
+                  if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                    arg0: GET_VAR 'it: kotlin.Int declared in <root>.testLrmFoo1.<anonymous>' type=kotlin.Int origin=null
+                    arg1: CONST Int type=kotlin.Unit value=0
+                  then: RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Int): kotlin.Unit declared in <root>.testLrmFoo1'
+                    GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+              CALL 'public final fun print (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+                message: GET_VAR 'it: kotlin.Int declared in <root>.testLrmFoo1.<anonymous>' type=kotlin.Int origin=null
+          FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.Int): kotlin.Unit declared in <root>.testLrmFoo1' type=kotlin.Unit origin=LAMBDA
   FUN name:testLrmFoo2 visibility:public modality:FINAL <> (ints:kotlin.collections.List<kotlin.Int>) returnType:kotlin.Unit 
     VALUE_PARAMETER name:ints index:0 type:kotlin.collections.List<kotlin.Int> 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: <Ambiguity: forEach, [kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/collections/forEach, kotlin/sequences/forEach, kotlin/text/forEach]>#' type=IrErrorType
-        BLOCK type=IrErrorType origin=LAMBDA
-          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+      CALL 'public final fun forEach (action: kotlin.Function1<T of <uninitialized parent>, kotlin.Unit>): kotlin.Unit [inline] declared in kotlin.collections' type=kotlin.Unit origin=null
+        action: BLOCK type=kotlin.Unit origin=LAMBDA
+          FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:kotlin.Int) returnType:kotlin.Unit 
+            VALUE_PARAMETER name:it index:0 type:kotlin.Int 
             BLOCK_BODY
-              RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.testLrmFoo2'
-                BLOCK type=IrErrorType origin=null
-                  WHEN type=kotlin.Unit origin=IF
-                    BRANCH
-                      if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
-                        arg0: ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
-                        arg1: CONST Int type=kotlin.Int value=0
-                      then: RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.testLrmFoo2'
-                        GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
-                  ERROR_CALL 'Unresolved reference: <Ambiguity: print, [kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print, kotlin/io/print]>#' type=IrErrorType
-                    ERROR_CALL 'Unresolved reference: <Unresolved name: it>#' type=IrErrorType
-          FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.testLrmFoo2' type=IrErrorType origin=LAMBDA
+              WHEN type=kotlin.Unit origin=IF
+                BRANCH
+                  if: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EQEQ
+                    arg0: GET_VAR 'it: kotlin.Int declared in <root>.testLrmFoo2.<anonymous>' type=kotlin.Int origin=null
+                    arg1: CONST Int type=kotlin.Unit value=0
+                  then: RETURN type=kotlin.Nothing from='local final fun <anonymous> (it: kotlin.Int): kotlin.Unit declared in <root>.testLrmFoo2'
+                    GET_OBJECT 'CLASS IR_EXTERNAL_DECLARATION_STUB OBJECT name:Unit modality:FINAL visibility:public superTypes:[kotlin.Any]' type=kotlin.Unit
+              CALL 'public final fun print (message: kotlin.Int): kotlin.Unit [inline] declared in kotlin.io' type=kotlin.Unit origin=null
+                message: GET_VAR 'it: kotlin.Int declared in <root>.testLrmFoo2.<anonymous>' type=kotlin.Int origin=null
+          FUNCTION_REFERENCE 'local final fun <anonymous> (it: kotlin.Int): kotlin.Unit declared in <root>.testLrmFoo2' type=kotlin.Unit origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt b/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt
index 7d3e0ad4fc6..e43e2170ee7 100644
--- a/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt
+++ b/compiler/testData/ir/irText/lambdas/samAdapter.fir.txt
@@ -6,8 +6,8 @@ FILE fqName:<root> fileName:/samAdapter.kt
           BLOCK type=IrErrorType origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.test1'
-                  ERROR_CALL 'Unresolved reference: <Ambiguity: println, [kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println, kotlin/io/println]>#' type=IrErrorType
-                    CONST String type=kotlin.String value="Hello, world!"
+                ERROR_CALL 'Unresolved reference: println#' type=IrErrorType
+                  CONST String type=IrErrorType value="Hello, world!"
             FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.test1' type=IrErrorType origin=LAMBDA
-      ERROR_CALL 'Unresolved reference: <Ambiguity: run, [kotlin/run, kotlin/run]>#' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: <Inapplicable(WRONG_RECEIVER): [kotlin/run]>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt
index 95cd19bb3f5..5cc5a61af27 100644
--- a/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt
+++ b/compiler/testData/ir/irText/regressions/coercionInLoop.fir.txt
@@ -1,23 +1,22 @@
 FILE fqName:<root> fileName:/coercionInLoop.kt
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String 
     BLOCK_BODY
-      VAR name:a type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: DoubleArray>#' type=IrErrorType
-          CONST Int type=kotlin.Int value=5
-      VAR name:x type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: iterator>#' type=IrErrorType
+      VAR name:a type:kotlin.DoubleArray [val] 
+        CONSTRUCTOR_CALL 'public constructor <init> (size: kotlin.Int) [primary] declared in kotlin.DoubleArray' type=kotlin.DoubleArray origin=null
+      VAR name:x type:kotlin.collections.DoubleIterator [val] 
+        CALL 'public final fun iterator (): kotlin.collections.DoubleIterator declared in kotlin.DoubleArray' type=kotlin.collections.DoubleIterator origin=null
       VAR name:i type:kotlin.Int [var] 
         CONST Int type=kotlin.Int value=0
       WHILE label=null origin=WHILE_LOOP
-        condition: ERROR_CALL 'Unresolved reference: <Unresolved name: hasNext>#' type=IrErrorType
+        condition: CALL 'public abstract fun hasNext (): kotlin.Boolean declared in kotlin.collections.Iterator' type=kotlin.Boolean origin=null
         body: BLOCK type=kotlin.Int origin=null
           WHEN type=kotlin.String origin=IF
             BRANCH
               if: CALL 'public final fun not (): kotlin.Boolean declared in kotlin.Boolean' type=kotlin.Boolean origin=EXCLEQ
                 $this: CALL 'public final fun EQEQ (arg0: kotlin.Any?, arg1: kotlin.Any?): kotlin.Boolean declared in kotlin.internal.ir' type=kotlin.Boolean origin=EXCLEQ
-                  arg0: ERROR_CALL 'Unresolved reference: <Unresolved name: get>#' type=IrErrorType
-                    GET_VAR 'var i: kotlin.Int [var] declared in <root>.box' type=kotlin.Int origin=null
-                  arg1: ERROR_CALL 'Unresolved reference: <Unresolved name: next>#' type=IrErrorType
+                  arg0: CALL 'public final fun get (index: kotlin.Int): kotlin.Double declared in kotlin.DoubleArray' type=kotlin.Double origin=null
+                    index: GET_VAR 'var i: kotlin.Int [var] declared in <root>.box' type=kotlin.Int origin=null
+                  arg1: CALL 'public final fun next (): kotlin.Double declared in kotlin.collections.DoubleIterator' type=kotlin.Double origin=null
               then: RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
                 STRING_CONCATENATION type=kotlin.String
                   CONST String type=kotlin.String value="Fail "
@@ -28,3 +27,4 @@ FILE fqName:<root> fileName:/coercionInLoop.kt
           GET_VAR 'val <unary>: kotlin.Int [val] declared in <root>.box' type=kotlin.Int origin=null
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK"
+
diff --git a/compiler/testData/ir/irText/regressions/integerCoercionToT.fir.txt b/compiler/testData/ir/irText/regressions/integerCoercionToT.fir.txt
index d9e3ce24b65..ffb8e3d92b3 100644
--- a/compiler/testData/ir/irText/regressions/integerCoercionToT.fir.txt
+++ b/compiler/testData/ir/irText/regressions/integerCoercionToT.fir.txt
@@ -22,7 +22,7 @@ FILE fqName:<root> fileName:/integerCoercionToT.kt
   CLASS CLASS name:CInt32VarX modality:FINAL visibility:public superTypes:[<root>.CPointed]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.CInt32VarX 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.CInt32VarX<T of <root>.CInt32VarX> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.CInt32VarX<T of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:CInt32VarX modality:FINAL visibility:public superTypes:[<root>.CPointed]'
@@ -84,4 +84,5 @@ FILE fqName:<root> fileName:/integerCoercionToT.kt
     VALUE_PARAMETER name:value index:0 type:<root>.IdType 
     VALUE_PARAMETER name:cv index:1 type:<root>.CInt32VarX 
     BLOCK_BODY
-      ERROR_CALL 'Unresolved reference: R|<local>/value|' type=IrErrorType
+      ERROR_CALL 'Unresolved reference: R|/value|' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/regressions/kt24114.fir.txt b/compiler/testData/ir/irText/regressions/kt24114.fir.txt
index b206458c11d..76528bf275d 100644
--- a/compiler/testData/ir/irText/regressions/kt24114.fir.txt
+++ b/compiler/testData/ir/irText/regressions/kt24114.fir.txt
@@ -55,3 +55,4 @@ FILE fqName:<root> fileName:/kt24114.kt
               if: CONST Boolean type=kotlin.Boolean value=true
               then: RETURN type=kotlin.Nothing from='public final fun test2 (): kotlin.Int declared in <root>'
                 CONST Int type=kotlin.Int value=3
+
diff --git a/compiler/testData/ir/irText/regressions/newInference/fixationOrder1.fir.txt b/compiler/testData/ir/irText/regressions/newInference/fixationOrder1.fir.txt
index f1561aa8a34..029b77d0a59 100644
--- a/compiler/testData/ir/irText/regressions/newInference/fixationOrder1.fir.txt
+++ b/compiler/testData/ir/irText/regressions/newInference/fixationOrder1.fir.txt
@@ -1,9 +1,9 @@
 FILE fqName:<root> fileName:/fixationOrder1.kt
-  FUN name:foo visibility:public modality:FINAL <X, Y> () returnType:kotlin.Function1 
+  FUN name:foo visibility:public modality:FINAL <X, Y> () returnType:kotlin.Function1<X of <root>.foo, Y of <root>.foo> 
     TYPE_PARAMETER name:X index:0 variance: superTypes:[]
-    TYPE_PARAMETER name:Y index:1 variance: superTypes:[]
+    TYPE_PARAMETER name:Y index:0 variance: superTypes:[]
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun foo <X, Y> (): kotlin.Function1 declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun foo <X, Y> (): kotlin.Function1<X of <root>.foo, Y of <root>.foo> declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null
   CLASS INTERFACE name:Inv2 modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Inv2 
@@ -22,29 +22,30 @@ FILE fqName:<root> fileName:/fixationOrder1.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:check visibility:public modality:FINAL <T, R> (x:T of <root>.check, y:R of <root>.check, f:kotlin.Function1) returnType:<root>.Inv2<T of <root>.check, R of <root>.check> 
+  FUN name:check visibility:public modality:FINAL <T, R> (x:T of <root>.check, y:R of <root>.check, f:kotlin.Function1<T of <root>.check, R of <root>.check>) returnType:<root>.Inv2<T of <root>.check, R of <root>.check> 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
     TYPE_PARAMETER name:R index:0 variance: superTypes:[]
     VALUE_PARAMETER name:x index:0 type:T of <root>.check 
     VALUE_PARAMETER name:y index:1 type:R of <root>.check 
-    VALUE_PARAMETER name:f index:2 type:kotlin.Function1 
+    VALUE_PARAMETER name:f index:2 type:kotlin.Function1<T of <root>.check, R of <root>.check> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun check <T, R> (x: T of <root>.check, y: R of <root>.check, f: kotlin.Function1): <root>.Inv2<T of <root>.check, R of <root>.check> declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun check <T, R> (x: T of <root>.check, y: R of <root>.check, f: kotlin.Function1<T of <root>.check, R of <root>.check>): <root>.Inv2<T of <root>.check, R of <root>.check> declared in <root>'
         CALL 'public final fun TODO (): kotlin.Nothing [inline] declared in kotlin' type=kotlin.Nothing origin=null
-  FUN name:test visibility:public modality:FINAL <> () returnType:<root>.Inv2<T of <root>.check, R of <root>.check> 
+  FUN name:test visibility:public modality:FINAL <> () returnType:<root>.Inv2<kotlin.String, kotlin.Int> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test (): <root>.Inv2<T of <root>.check, R of <root>.check> declared in <root>'
-        CALL 'public final fun check <T, R> (x: T of <root>.check, y: R of <root>.check, f: kotlin.Function1): <root>.Inv2<T of <root>.check, R of <root>.check> declared in <root>' type=<root>.Inv2<T of <root>.check, R of <root>.check> origin=null
+      RETURN type=kotlin.Nothing from='public final fun test (): <root>.Inv2<kotlin.String, kotlin.Int> declared in <root>'
+        CALL 'public final fun check <T, R> (x: T of <root>.check, y: R of <root>.check, f: kotlin.Function1<T of <root>.check, R of <root>.check>): <root>.Inv2<T of <root>.check, R of <root>.check> declared in <root>' type=<root>.Inv2<kotlin.String, kotlin.Int> origin=null
           <T>: <none>
           <R>: <none>
           x: CONST String type=kotlin.String value=""
           y: CONST Int type=kotlin.Int value=1
-          f: CALL 'public final fun foo <X, Y> (): kotlin.Function1 declared in <root>' type=kotlin.Function1 origin=null
+          f: CALL 'public final fun foo <X, Y> (): kotlin.Function1<X of <root>.foo, Y of <root>.foo> declared in <root>' type=kotlin.Function1<kotlin.Any?, kotlin.Any?> origin=null
             <X>: <none>
             <Y>: <none>
   FUN name:box visibility:public modality:FINAL <> () returnType:kotlin.String 
     BLOCK_BODY
       VAR name:x type:<root>.Inv2<kotlin.String, kotlin.Int> [val] 
-        CALL 'public final fun test (): <root>.Inv2<T of <root>.check, R of <root>.check> declared in <root>' type=<root>.Inv2<T of <root>.check, R of <root>.check> origin=null
+        CALL 'public final fun test (): <root>.Inv2<kotlin.String, kotlin.Int> declared in <root>' type=<root>.Inv2<kotlin.String, kotlin.Int> origin=null
       RETURN type=kotlin.Nothing from='public final fun box (): kotlin.String declared in <root>'
         CONST String type=kotlin.String value="OK"
+
diff --git a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt
index 43f0fbe0db9..d9d923b838f 100644
--- a/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt
+++ b/compiler/testData/ir/irText/regressions/typeAliasCtorForGenericClass.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/typeAliasCtorForGenericClass.kt
   CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.A 
     TYPE_PARAMETER name:Q index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (q:Q of <root>.A) returnType:<root>.A<Q of <root>.A> [primary] 
-      VALUE_PARAMETER name:q index:0 type:Q of <root>.A 
+    CONSTRUCTOR visibility:public <> (q:Q of <uninitialized parent>) returnType:<root>.A<Q of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:q index:0 type:Q of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:A modality:FINAL visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:q visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:q type:Q of <root>.A visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'q: Q of <root>.A declared in <root>.A.<init>' type=Q of <root>.A origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'q: Q of <uninitialized parent> declared in <root>.A.<init>' type=Q of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-q> visibility:public modality:FINAL <> ($this:<root>.A) returnType:Q of <root>.A 
         correspondingProperty: PROPERTY name:q visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.A 
@@ -33,9 +33,9 @@ FILE fqName:<root> fileName:/typeAliasCtorForGenericClass.kt
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
   FUN name:bar visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:b type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: B>#' type=IrErrorType
-          CONST Int type=kotlin.Int value=2
-      VAR name:b2 type:IrErrorType [val] 
-        ERROR_CALL 'Unresolved reference: <Unresolved name: B2>#' type=IrErrorType
-          GET_VAR 'val b: IrErrorType [val] declared in <root>.bar' type=IrErrorType origin=null
+      VAR name:b type:<root>.A<kotlin.Int> [val]
+        CONSTRUCTOR_CALL 'public constructor <init> (q: Q of <uninitialized parent>) [primary] declared in <root>.A' type=<root>.A<kotlin.Int> origin=null
+          <class: Q>: <none>
+      VAR name:b2 type:<root>.A<<root>.A<kotlin.Int>> [val]
+        CONSTRUCTOR_CALL 'public constructor <init> (q: Q of <uninitialized parent>) [primary] declared in <root>.A' type=<root>.A<<root>.A<kotlin.Int>> origin=null
+          <class: Q>: <none>
diff --git a/compiler/testData/ir/irText/singletons/companion.fir.txt b/compiler/testData/ir/irText/singletons/companion.fir.txt
index cfadef28f20..98d922e9551 100644
--- a/compiler/testData/ir/irText/singletons/companion.fir.txt
+++ b/compiler/testData/ir/irText/singletons/companion.fir.txt
@@ -8,7 +8,7 @@ FILE fqName:<root> fileName:/companion.kt
     FUN name:test2 visibility:public modality:FINAL <> ($this:<root>.Z) returnType:kotlin.Unit 
       $this: VALUE_PARAMETER name:<this> type:<root>.Z 
       BLOCK_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: test>#' type=IrErrorType
+        CALL 'public final fun test (): kotlin.Unit declared in <root>.Z.Companion' type=kotlin.Unit origin=null
     CLASS OBJECT name:Companion modality:FINAL visibility:public [companion] superTypes:[kotlin.Any]
       $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Z.Companion 
       CONSTRUCTOR visibility:private <> () returnType:<root>.Z.Companion [primary] 
@@ -44,3 +44,4 @@ FILE fqName:<root> fileName:/companion.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/singletons/enumEntry.fir.txt b/compiler/testData/ir/irText/singletons/enumEntry.fir.txt
index 4d5ced33072..95d521ace19 100644
--- a/compiler/testData/ir/irText/singletons/enumEntry.fir.txt
+++ b/compiler/testData/ir/irText/singletons/enumEntry.fir.txt
@@ -72,3 +72,4 @@ FILE fqName:<root> fileName:/enumEntry.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Enum
       $this: VALUE_PARAMETER name:<this> type:kotlin.Enum 
+
diff --git a/compiler/testData/ir/irText/singletons/object.fir.txt b/compiler/testData/ir/irText/singletons/object.fir.txt
index bbf7e6e1754..93df4a99400 100644
--- a/compiler/testData/ir/irText/singletons/object.fir.txt
+++ b/compiler/testData/ir/irText/singletons/object.fir.txt
@@ -44,3 +44,4 @@ FILE fqName:<root> fileName:/object.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
index c757bbfeef8..b01984a27a1 100644
--- a/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
+++ b/compiler/testData/ir/irText/stubs/builtinMap.fir.txt
@@ -12,12 +12,13 @@ FILE fqName:<root> fileName:/builtinMap.kt
               GET_VAR 'pair: kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> declared in <root>.plus' type=kotlin.Pair<K1 of <root>.plus, V1 of <root>.plus> origin=null
           BRANCH
             if: CONST Boolean type=kotlin.Boolean value=true
-            then: CALL 'public final fun apply (block: kotlin.Function1<T of <uninitialized parent>, kotlin.Unit>): T of <uninitialized parent> [inline] declared in kotlin' type=T of <uninitialized parent> origin=null
-              block: BLOCK type=IrErrorType origin=LAMBDA
-                FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
+            then: CALL 'public final fun apply (block: kotlin.Function1<T of <uninitialized parent>, kotlin.Unit>): T of <uninitialized parent> [inline] declared in kotlin' type=java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus> origin=null
+              block: BLOCK type=kotlin.Unit origin=LAMBDA
+                FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> (it:java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>) returnType:kotlin.Unit 
+                  VALUE_PARAMETER name:it index:0 type:java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus> 
                   BLOCK_BODY
-                    RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.plus'
-                      ERROR_CALL 'Unresolved reference: <Unresolved name: put>#' type=IrErrorType
-                        ERROR_CALL 'Unresolved reference: <Unresolved name: first>#' type=IrErrorType
-                        ERROR_CALL 'Unresolved reference: <Unresolved name: second>#' type=IrErrorType
-                FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.plus' type=IrErrorType origin=LAMBDA
+                    ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [java/util/HashMap.put]>#' type=IrErrorType
+                      ERROR_CALL 'No getter found for R|kotlin/Pair.first|' type=A of <uninitialized parent>
+                      ERROR_CALL 'No getter found for R|kotlin/Pair.second|' type=B of <uninitialized parent>
+                FUNCTION_REFERENCE 'local final fun <anonymous> (it: java.util.LinkedHashMap<K1 of <root>.plus, V1 of <root>.plus>): kotlin.Unit declared in <root>.plus' type=kotlin.Unit origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt b/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt
index 20122c865d8..5a20f9c1ca7 100644
--- a/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt
+++ b/compiler/testData/ir/irText/stubs/constFromBuiltins.fir.txt
@@ -1,10 +1,11 @@
 FILE fqName:<root> fileName:/constFromBuiltins.kt
   PROPERTY name:test visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: MIN_VALUE>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        ERROR_CALL 'No getter found for R|kotlin/Int.Companion.MIN_VALUE|' type=kotlin.Int
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.fir.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.fir.txt
index 4e80c80b092..13897e802ef 100644
--- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.fir.txt
+++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m1.fir.txt
@@ -2,15 +2,15 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m1.kt
   CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Base 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Base) returnType:<root>.Base<T of <root>.Base> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Base 
+    CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Base<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Base modality:ABSTRACT visibility:public superTypes:[kotlin.Any]'
     PROPERTY name:x visibility:public modality:FINAL [val] 
       FIELD PROPERTY_BACKING_FIELD name:x type:T of <root>.Base visibility:public [final] 
         EXPRESSION_BODY
-          GET_VAR 'x: T of <root>.Base declared in <root>.Base.<init>' type=T of <root>.Base origin=INITIALIZE_PROPERTY_FROM_PARAMETER
+          GET_VAR 'x: T of <uninitialized parent> declared in <root>.Base.<init>' type=T of <uninitialized parent> origin=INITIALIZE_PROPERTY_FROM_PARAMETER
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-x> visibility:public modality:FINAL <> ($this:<root>.Base) returnType:T of <root>.Base 
         correspondingProperty: PROPERTY name:x visibility:public modality:FINAL [val] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Base 
@@ -51,3 +51,4 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m1.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt
index 433f5fa77a8..f81c06981cf 100644
--- a/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt
+++ b/compiler/testData/ir/irText/stubs/genericClassInDifferentModule_m2.fir.txt
@@ -2,11 +2,11 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
   CLASS CLASS name:Derived1 modality:FINAL visibility:public superTypes:[<root>.Base<T of <root>.Derived1>]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.Derived1 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    CONSTRUCTOR visibility:public <> (x:T of <root>.Derived1) returnType:<root>.Derived1<T of <root>.Derived1> [primary] 
-      VALUE_PARAMETER name:x index:0 type:T of <root>.Derived1 
+    CONSTRUCTOR visibility:public <> (x:T of <uninitialized parent>) returnType:<root>.Derived1<T of <uninitialized parent>> [primary] 
+      VALUE_PARAMETER name:x index:0 type:T of <uninitialized parent> 
       BLOCK_BODY
-        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: T of <root>.Base) [primary] declared in <root>.Base'
-          x: GET_VAR 'x: T of <root>.Derived1 declared in <root>.Derived1.<init>' type=T of <root>.Derived1 origin=null
+        DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> (x: T of <uninitialized parent>) [primary] declared in <root>.Base'
+          x: GET_VAR 'x: T of <uninitialized parent> declared in <root>.Derived1.<init>' type=T of <uninitialized parent> origin=null
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:Derived1 modality:FINAL visibility:public superTypes:[<root>.Base<T of <root>.Derived1>]'
     FUN name:foo visibility:public modality:FINAL <Y> ($this:<root>.Derived1, y:Y of <root>.Derived1.foo) returnType:T of <root>.Derived1 
       TYPE_PARAMETER name:Y index:0 variance: superTypes:[]
@@ -18,7 +18,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
     PROPERTY name:bar visibility:public modality:FINAL [var] 
       FIELD PROPERTY_BACKING_FIELD name:bar type:T of <root>.Derived1 visibility:public 
         EXPRESSION_BODY
-          CALL 'public final fun <get-x> (): T of <root>.Base declared in <root>.Base' type=T of <root>.Base origin=null
+          GET_VAR 'x: T of <uninitialized parent> declared in <root>.Derived1.<init>' type=T of <uninitialized parent> origin=null
       FUN DEFAULT_PROPERTY_ACCESSOR name:<get-bar> visibility:public modality:FINAL <> ($this:<root>.Derived1) returnType:T of <root>.Derived1 
         correspondingProperty: PROPERTY name:bar visibility:public modality:FINAL [var] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Derived1 
@@ -40,7 +40,7 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
         $this: VALUE_PARAMETER name:<this> type:<root>.Derived1 
         BLOCK_BODY
           RETURN type=kotlin.Nothing from='public final fun <get-exn> (): T of <root>.Derived1 declared in <root>.Derived1'
-            CALL 'public final fun <get-x> (): T of <root>.Base declared in <root>.Base' type=T of <root>.Base origin=null
+            GET_VAR 'x: T of <uninitialized parent> declared in <root>.Derived1.<init>' type=T of <uninitialized parent> origin=null
       FUN name:<set-exn> visibility:public modality:FINAL <> ($this:<root>.Derived1, value:T of <root>.Derived1) returnType:kotlin.Unit 
         correspondingProperty: PROPERTY name:exn visibility:public modality:FINAL [var] 
         $this: VALUE_PARAMETER name:<this> type:<root>.Derived1 
@@ -59,3 +59,4 @@ FILE fqName:<root> fileName:/genericClassInDifferentModule_m2.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.txt b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.txt
index 2838e93b07e..17f144d76a7 100644
--- a/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaConstructorWithTypeParameters.fir.txt
@@ -1,12 +1,12 @@
 FILE fqName:<root> fileName:/javaConstructorWithTypeParameters.kt
-  FUN name:test1 visibility:public modality:FINAL <> () returnType:<root>.J1 
+  FUN name:test1 visibility:public modality:FINAL <> () returnType:<root>.J1<kotlin.Int> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.J1 declared in <root>'
-        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1' type=<root>.J1 origin=null
-  FUN name:test2 visibility:public modality:FINAL <> () returnType:<root>.J1 
+      RETURN type=kotlin.Nothing from='public final fun test1 (): <root>.J1<kotlin.Int> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> () declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
+  FUN name:test2 visibility:public modality:FINAL <> () returnType:<root>.J1<kotlin.Int> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.J1 declared in <root>'
-        CONSTRUCTOR_CALL 'public constructor <init> (x1: X1 of <uninitialized parent>?) declared in <root>.J1' type=<root>.J1 origin=null
+      RETURN type=kotlin.Nothing from='public final fun test2 (): <root>.J1<kotlin.Int> declared in <root>'
+        CONSTRUCTOR_CALL 'public constructor <init> (x1: X1 of <uninitialized parent>?) declared in <root>.J1' type=<root>.J1<kotlin.Int> origin=null
   FUN name:test3 visibility:public modality:FINAL <> (j1:<root>.J1<kotlin.Any>) returnType:IrErrorType 
     VALUE_PARAMETER name:j1 index:0 type:<root>.J1<kotlin.Any> 
     BLOCK_BODY
@@ -18,3 +18,4 @@ FILE fqName:<root> fileName:/javaConstructorWithTypeParameters.kt
       RETURN type=kotlin.Nothing from='public final fun test4 (j1: <root>.J1<kotlin.Any>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: J2>#' type=IrErrorType
           CONST Int type=kotlin.Int value=1
+
diff --git a/compiler/testData/ir/irText/stubs/javaEnum.fir.txt b/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
index f8d7e78e263..ce943c26733 100644
--- a/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaEnum.fir.txt
@@ -1,10 +1,11 @@
 FILE fqName:<root> fileName:/javaEnum.kt
   PROPERTY name:test visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum? visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Unresolved name: ONE>#' type=IrErrorType
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        ERROR_CALL 'No getter found for R|/JEnum.ONE|' type=<root>.JEnum?
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:<root>.JEnum? 
       correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test> (): <root>.JEnum? declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:<root>.JEnum? visibility:public [final,static] ' type=<root>.JEnum? origin=null
+
diff --git a/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt b/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt
index 10d2e937bbe..ac6042ffc91 100644
--- a/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaInnerClass.fir.txt
@@ -20,45 +20,17 @@ FILE fqName:<root> fileName:/javaInnerClass.kt
       overridden:
         public open fun bar (): kotlin.Unit declared in <root>.J
       $this: VALUE_PARAMETER name:<this> type:<root>.J 
-    FUN FAKE_OVERRIDE name:registerNatives visibility:private modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
+    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:kotlin.Any, other:kotlin.Any?) returnType:kotlin.Boolean 
       overridden:
-        private open fun registerNatives (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:getClass visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:java.lang.Class<*>? 
+        public open fun equals (other: kotlin.Any?): kotlin.Boolean declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+      VALUE_PARAMETER name:other index:0 type:kotlin.Any? 
+    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.Int 
       overridden:
-        public final fun getClass (): java.lang.Class<*>? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:hashCode visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Int 
+        public open fun hashCode (): kotlin.Int declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:kotlin.Any) returnType:kotlin.String 
       overridden:
-        public open fun hashCode (): kotlin.Int declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:equals visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object, obj:kotlin.Any?) returnType:kotlin.Boolean 
-      overridden:
-        public open fun equals (obj: kotlin.Any?): kotlin.Boolean declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:obj index:0 type:kotlin.Any? 
-    FUN FAKE_OVERRIDE name:clone visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Any? 
-      overridden:
-        protected/*protected and package*/ open fun clone (): kotlin.Any? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:toString visibility:public modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.String? 
-      overridden:
-        public open fun toString (): kotlin.String? declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notify visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notify (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:notifyAll visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        public final fun notifyAll (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-    FUN FAKE_OVERRIDE name:wait visibility:public modality:FINAL <> ($this:<uninitialized parent>.Object, <anonymous Java parameter>:kotlin.Long) returnType:kotlin.Unit 
-      overridden:
-        public final fun wait (<anonymous Java parameter>: kotlin.Long): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
-      VALUE_PARAMETER name:<anonymous Java parameter> index:0 type:kotlin.Long 
-    FUN FAKE_OVERRIDE name:finalize visibility:protected/*protected and package*/ modality:OPEN <> ($this:<uninitialized parent>.Object) returnType:kotlin.Unit 
-      overridden:
-        protected/*protected and package*/ open fun finalize (): kotlin.Unit declared in <no parent>.Object
-      $this: VALUE_PARAMETER name:<this> type:<uninitialized parent>.Object 
+        public open fun toString (): kotlin.String declared in kotlin.Any
+      $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
+
diff --git a/compiler/testData/ir/irText/stubs/javaMethod.fir.txt b/compiler/testData/ir/irText/stubs/javaMethod.fir.txt
index 0438ecf1496..0557fc3e168 100644
--- a/compiler/testData/ir/irText/stubs/javaMethod.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaMethod.fir.txt
@@ -4,3 +4,4 @@ FILE fqName:<root> fileName:/javaMethod.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (j: <root>.J): kotlin.Unit declared in <root>'
         CALL 'public open fun bar (): kotlin.Unit declared in <root>.J' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt b/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt
index a760b378128..9fcb96e9d68 100644
--- a/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaNestedClass.fir.txt
@@ -4,3 +4,4 @@ FILE fqName:<root> fileName:/javaNestedClass.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (jj: <root>.J.JJ): kotlin.Unit declared in <root>'
         CALL 'public open fun foo (): kotlin.Unit declared in <root>.J.JJ' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt
index 2bf9ae6e908..25ba98d28d0 100644
--- a/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt
+++ b/compiler/testData/ir/irText/stubs/javaSyntheticProperty.fir.txt
@@ -8,3 +8,4 @@ FILE fqName:<root> fileName:/javaSyntheticProperty.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
           GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+
diff --git a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt
index a7d715b3b11..9349d87ec3a 100644
--- a/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt
+++ b/compiler/testData/ir/irText/stubs/jdkClassSyntheticProperty.fir.txt
@@ -5,3 +5,4 @@ FILE fqName:<root> fileName:/jdkClassSyntheticProperty.kt
       BLOCK_BODY
         RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
           ERROR_CALL 'Unresolved reference: <Unresolved name: declaredFields>#' type=IrErrorType
+
diff --git a/compiler/testData/ir/irText/stubs/kotlinInnerClass.fir.txt b/compiler/testData/ir/irText/stubs/kotlinInnerClass.fir.txt
index f949af0f0b2..56897e1b055 100644
--- a/compiler/testData/ir/irText/stubs/kotlinInnerClass.fir.txt
+++ b/compiler/testData/ir/irText/stubs/kotlinInnerClass.fir.txt
@@ -4,3 +4,4 @@ FILE fqName:<root> fileName:/kotlinInnerClass.kt
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun test (inner: <root>.Outer.Inner): kotlin.Unit declared in <root>'
         CALL 'public final fun foo (): kotlin.Unit declared in <root>.Outer.Inner' type=kotlin.Unit origin=null
+
diff --git a/compiler/testData/ir/irText/stubs/simple.fir.txt b/compiler/testData/ir/irText/stubs/simple.fir.txt
index 7d7d30b3ee4..9336d00b675 100644
--- a/compiler/testData/ir/irText/stubs/simple.fir.txt
+++ b/compiler/testData/ir/irText/stubs/simple.fir.txt
@@ -1,11 +1,12 @@
 FILE fqName:<root> fileName:/simple.kt
   PROPERTY name:test visibility:public modality:FINAL [val] 
-    FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] 
+    FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] 
       EXPRESSION_BODY
-        ERROR_CALL 'Unresolved reference: <Ambiguity: plus, [kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus, kotlin/Int.plus]>#' type=IrErrorType
-          CONST Int type=kotlin.Int value=2
-    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:IrErrorType 
+        CALL 'public final fun plus (other: kotlin.Int): kotlin.Int declared in kotlin.Int' type=kotlin.Int origin=null
+          other: CONST Int type=kotlin.Int value=2
+    FUN DEFAULT_PROPERTY_ACCESSOR name:<get-test> visibility:public modality:FINAL <> () returnType:kotlin.Int 
       correspondingProperty: PROPERTY name:test visibility:public modality:FINAL [val] 
       BLOCK_BODY
-        RETURN type=kotlin.Nothing from='public final fun <get-test> (): IrErrorType declared in <root>'
-          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:IrErrorType visibility:public [final,static] ' type=IrErrorType origin=null
+        RETURN type=kotlin.Nothing from='public final fun <get-test> (): kotlin.Int declared in <root>'
+          GET_FIELD 'FIELD PROPERTY_BACKING_FIELD name:test type:kotlin.Int visibility:public [final,static] ' type=kotlin.Int origin=null
+
diff --git a/compiler/testData/ir/irText/types/intersectionType1.fir.txt b/compiler/testData/ir/irText/types/intersectionType1.fir.txt
index e316f9d46d8..b2757bcda01 100644
--- a/compiler/testData/ir/irText/types/intersectionType1.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType1.fir.txt
@@ -2,7 +2,7 @@ FILE fqName:<root> fileName:/intersectionType1.kt
   CLASS CLASS name:In modality:FINAL visibility:public superTypes:[kotlin.Any]
     $this: VALUE_PARAMETER INSTANCE_RECEIVER name:<this> type:<root>.In 
     TYPE_PARAMETER name:I index:0 variance:in superTypes:[]
-    CONSTRUCTOR visibility:public <> () returnType:<root>.In<I of <root>.In> [primary] 
+    CONSTRUCTOR visibility:public <> () returnType:<root>.In<I of <uninitialized parent>> [primary] 
       BLOCK_BODY
         DELEGATING_CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in kotlin.Any'
         INSTANCE_INITIALIZER_CALL classDescriptor='CLASS CLASS name:In modality:FINAL visibility:public superTypes:[kotlin.Any]'
@@ -43,15 +43,14 @@ FILE fqName:<root> fileName:/intersectionType1.kt
           GET_VAR 'y: kotlin.Any? declared in <root>.ofType' type=kotlin.Any? origin=null
   FUN name:test visibility:public modality:FINAL <> () returnType:kotlin.Unit 
     BLOCK_BODY
-      VAR name:a1 type:kotlin.Array<T of <uninitialized parent>> [val] 
-        CALL 'public final fun arrayOf (elements: kotlin.Array<out T of <uninitialized parent>>): kotlin.Array<T of <uninitialized parent>> [inline] declared in kotlin' type=kotlin.Array<T of <uninitialized parent>> origin=null
-          elements: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.In' type=<root>.In<I of <root>.In> origin=null
+      VAR name:a1 type:kotlin.Array<kotlin.Any?> [val]
+        CALL 'public final fun arrayOf (elements: kotlin.Array<out T of <uninitialized parent>>): kotlin.Array<T of <uninitialized parent>> [inline] declared in kotlin' type=kotlin.Array<kotlin.Any?> origin=null
+          elements: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.In' type=<root>.In<kotlin.Int> origin=null
             <class: I>: <none>
-      VAR name:a2 type:kotlin.Array<T of <uninitialized parent>> [val] 
-        CALL 'public final fun arrayOf (elements: kotlin.Array<out T of <uninitialized parent>>): kotlin.Array<T of <uninitialized parent>> [inline] declared in kotlin' type=kotlin.Array<T of <uninitialized parent>> origin=null
-          elements: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.In' type=<root>.In<I of <root>.In> origin=null
+      VAR name:a2 type:kotlin.Array<kotlin.Any?> [val]
+        CALL 'public final fun arrayOf (elements: kotlin.Array<out T of <uninitialized parent>>): kotlin.Array<T of <uninitialized parent>> [inline] declared in kotlin' type=kotlin.Array<kotlin.Any?> origin=null
+          elements: CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.In' type=<root>.In<kotlin.String> origin=null
             <class: I>: <none>
-      CALL 'public final fun foo <T> (a: kotlin.Array<<root>.In<T of <root>.foo>>, b: kotlin.Array<<root>.In<kotlin.String>>): kotlin.Boolean declared in <root>' type=kotlin.Boolean origin=null
-        <T>: <none>
-        a: GET_VAR 'val a1: kotlin.Array<T of <uninitialized parent>> [val] declared in <root>.test' type=kotlin.Array<T of <uninitialized parent>> origin=null
-        b: GET_VAR 'val a2: kotlin.Array<T of <uninitialized parent>> [val] declared in <root>.test' type=kotlin.Array<T of <uninitialized parent>> origin=null
+      ERROR_CALL 'Unresolved reference: <Inapplicable(INAPPLICABLE): [/foo]>#' type=IrErrorType
+        GET_VAR 'val a1: kotlin.Array<kotlin.Any?> [val] declared in <root>.test' type=kotlin.Array<kotlin.Any?> origin=null
+        GET_VAR 'val a2: kotlin.Array<kotlin.Any?> [val] declared in <root>.test' type=kotlin.Array<kotlin.Any?> origin=null
diff --git a/compiler/testData/ir/irText/types/intersectionType2.fir.txt b/compiler/testData/ir/irText/types/intersectionType2.fir.txt
index 0255c59cec5..954baf62c6d 100644
--- a/compiler/testData/ir/irText/types/intersectionType2.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType2.fir.txt
@@ -68,33 +68,32 @@ FILE fqName:<root> fileName:/intersectionType2.kt
       overridden:
         public open fun toString (): kotlin.String declared in kotlin.Any
       $this: VALUE_PARAMETER name:<this> type:kotlin.Any 
-  FUN name:run visibility:public modality:FINAL <T> (fn:kotlin.Function0) returnType:IrErrorType 
+  FUN name:run visibility:public modality:FINAL <T> (fn:kotlin.Function0<T of <root>.run>) returnType:IrErrorType 
     TYPE_PARAMETER name:T index:0 variance: superTypes:[]
-    VALUE_PARAMETER name:fn index:0 type:kotlin.Function0 
+    VALUE_PARAMETER name:fn index:0 type:kotlin.Function0<T of <root>.run> 
     BLOCK_BODY
-      RETURN type=kotlin.Nothing from='public final fun run <T> (fn: kotlin.Function0): IrErrorType declared in <root>'
+      RETURN type=kotlin.Nothing from='public final fun run <T> (fn: kotlin.Function0<T of <root>.run>): IrErrorType declared in <root>'
         ERROR_CALL 'Unresolved reference: <Unresolved name: fn>#' type=IrErrorType
   FUN name:foo visibility:public modality:FINAL <> () returnType:IrErrorType 
     BLOCK_BODY
       RETURN type=kotlin.Nothing from='public final fun foo (): IrErrorType declared in <root>'
-        CALL 'public final fun run <T> (fn: kotlin.Function0): IrErrorType declared in <root>' type=IrErrorType origin=null
+        CALL 'public final fun run <T> (fn: kotlin.Function0<T of <root>.run>): IrErrorType declared in <root>' type=IrErrorType origin=null
           <T>: <none>
           fn: BLOCK type=IrErrorType origin=LAMBDA
             FUN LOCAL_FUNCTION_FOR_LAMBDA name:<anonymous> visibility:local modality:FINAL <> () returnType:IrErrorType 
               BLOCK_BODY
-                RETURN type=kotlin.Nothing from='local final fun <anonymous> (): IrErrorType declared in <root>.foo'
-                  BLOCK type=<root>.B origin=null
-                    VAR name:mm type:<root>.B [val] 
-                      CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.B' type=<root>.B origin=null
-                    VAR name:nn type:<root>.C [val] 
-                      CONSTRUCTOR_CALL 'public constructor <init> () [primary] declared in <root>.C' type=<root>.C origin=null
-                    VAR name:c type:<root>.B [val] 
-                      WHEN type=<root>.B origin=IF
-                        BRANCH
-                          if: CONST Boolean type=kotlin.Boolean value=true
-                          then: GET_VAR 'val mm: <root>.B [val] declared in <root>.foo.<anonymous>' type=<root>.B origin=null
-                        BRANCH
-                          if: CONST Boolean type=kotlin.Boolean value=true
-                          then: GET_VAR 'val nn: <root>.C [val] declared in <root>.foo.<anonymous>' type=<root>.C origin=null
-                    GET_VAR 'val c: <root>.B [val] declared in <root>.foo.<anonymous>' type=<root>.B origin=null
+                VAR name:mm type:IrErrorType [val] 
+                  ERROR_CALL 'Unresolved reference: B#' type=IrErrorType
+                VAR name:nn type:IrErrorType [val] 
+                  ERROR_CALL 'Unresolved reference: C#' type=IrErrorType
+                VAR name:c type:IrErrorType [val] 
+                  WHEN type=IrErrorType origin=IF
+                    BRANCH
+                      if: CONST Boolean type=IrErrorType value=true
+                      then: ERROR_CALL 'Unresolved reference: mm#' type=IrErrorType
+                    BRANCH
+                      if: CONST Boolean type=kotlin.Boolean value=true
+                      then: ERROR_CALL 'Unresolved reference: nn#' type=IrErrorType
+                ERROR_CALL 'Unresolved reference: c#' type=IrErrorType
             FUNCTION_REFERENCE 'local final fun <anonymous> (): IrErrorType declared in <root>.foo' type=IrErrorType origin=LAMBDA
+
diff --git a/compiler/testData/ir/irText/types/intersectionType3.fir.txt b/compiler/testData/ir/irText/types/intersectionType3.fir.txt
index 6b9d22f0e39..10cc4a82715 100644
--- a/compiler/testData/ir/irText/types/intersectionType3.fir.txt
+++ b/compiler/testData/ir/irText/types/intersectionType3.fir.txt
@@ -165,3 +165,4 @@ FILE fqName:<root> fileName:/intersectionType3.kt
       RETURN type=kotlin.Nothing from='public final fun testInAs3 (x: <root>.In<<root>.A1>, y: <root>.In<<root>.A2>): kotlin.Unit declared in <root>'
         CALL 'public final fun asT <T> (): kotlin.Unit [inline] declared in <root>' type=kotlin.Unit origin=null
           <T>: <none>
+
diff --git a/compiler/testData/ir/irText/types/localVariableOfIntersectionType.fir.txt b/compiler/testData/ir/irText/types/localVariableOfIntersectionType.fir.txt
index 8d6c54c9d4c..af807cd5710 100644
--- a/compiler/testData/ir/irText/types/localVariableOfIntersectionType.fir.txt
+++ b/compiler/testData/ir/irText/types/localVariableOfIntersectionType.fir.txt
@@ -100,3 +100,4 @@ FILE fqName:<root> fileName:/localVariableOfIntersectionType.kt
         CALL 'public abstract fun <get-t> (): T of <root>.Inv declared in <root>.Inv' type=T of <root>.Inv origin=null
       ERROR_CALL 'Unresolved reference: <Unresolved name: foo>#' type=IrErrorType
       ERROR_CALL 'Unresolved reference: <Unresolved name: bar>#' type=IrErrorType
+